First, rewinding head to replay your work on top of it...
Applying: Currently translated at 100.0% (1198 of 1198 strings)
Using index info to reconstruct a base tree...
M js/web/_i18n/fr.json
Falling back to patching base and 3-way merge...
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Currently translated at 100.0% (1198 of 1198 strings)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
(1)
How many daily FPs per tile are lost for making space for new GBs? Example: You are removing some Shrines of Knowledge to build a GB => 1FP/5 tiles = 0.2FP/tile
Hány napi Fp/négyzetet veszítesz azzal, hogy helyet csinálsz új nevezetes épületnek? Példa: Eltávolítasz egy Tudás szentélyét, hogy megépíts egy nevezetes épületet => 1FP/45 négyzet=0.25 FP/négyzet