NoneAuto-merging js/web/_i18n/sv.json Auto-merging js/web/_i18n/ru.json Auto-merging js/web/_i18n/nl.json CONFLICT (content): Merge conflict in js/web/_i18n/nl.json Auto-merging js/web/_i18n/hu.json Auto-merging js/web/_i18n/fr.json CONFLICT (content): Merge conflict in js/web/_i18n/fr.json Auto-merging js/web/_i18n/en.json CONFLICT (content): Merge conflict in js/web/_i18n/en.json Auto-merging js/web/_i18n/de.json CONFLICT (content): Merge conflict in js/web/_i18n/de.json Auto-merging js/web/_i18n/cs.json CONFLICT (content): Merge conflict in js/web/_i18n/cs.json Automatic merge failed; fix conflicts and then commit the result. (1)3 years ago
First, rewinding head to replay your work on top of it... Applying: Currently translated at 100.0% (1164 of 1164 strings) Using index info to reconstruct a base tree... M js/web/_i18n/de.json Falling back to patching base and 3-way merge... Auto-merging js/web/_i18n/de.json CONFLICT (content): Merge conflict in js/web/_i18n/de.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% (1164 of 1164 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)3 years ago
Ixia