 admin
Failed rebase on repository |
a year ago
|
|
admin
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (French) Using index info to reconstruct a base tree... M closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties Falling back to patching base and 3-way merge... Auto-merging closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties CONFLICT (content): Merge conflict in closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (French) 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)a year ago |
|
admin
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (French) Using index info to reconstruct a base tree... M closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties Falling back to patching base and 3-way merge... Auto-merging closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties CONFLICT (content): Merge conflict in closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (French) 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)a year ago |