VStoiakin
NoneFirst, rewinding head to replay your work on top of it... Applying: i18n: update translations Using index info to reconstruct a base tree... M ui/sv.lproj/RingWizardChoose.strings M ui/sv.lproj/RingWizardNewAccount.strings Falling back to patching base and 3-way merge... Auto-merging ui/sv.lproj/RingWizardNewAccount.strings CONFLICT (content): Merge conflict in ui/sv.lproj/RingWizardNewAccount.strings Auto-merging ui/sv.lproj/RingWizardChoose.strings CONFLICT (content): Merge conflict in ui/sv.lproj/RingWizardChoose.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 i18n: update translations 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)2 months ago
First, rewinding head to replay your work on top of it... Applying: i18n: update translations Using index info to reconstruct a base tree... M ui/sv.lproj/RingWizardChoose.strings M ui/sv.lproj/RingWizardNewAccount.strings Falling back to patching base and 3-way merge... Auto-merging ui/sv.lproj/RingWizardNewAccount.strings CONFLICT (content): Merge conflict in ui/sv.lproj/RingWizardNewAccount.strings Auto-merging ui/sv.lproj/RingWizardChoose.strings CONFLICT (content): Merge conflict in ui/sv.lproj/RingWizardChoose.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 i18n: update translations 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)2 months ago
First, rewinding head to replay your work on top of it... Applying: i18n: update translations Using index info to reconstruct a base tree... M ui/sv.lproj/RingWizardChoose.strings M ui/sv.lproj/RingWizardNewAccount.strings Falling back to patching base and 3-way merge... Auto-merging ui/sv.lproj/RingWizardNewAccount.strings CONFLICT (content): Merge conflict in ui/sv.lproj/RingWizardNewAccount.strings Auto-merging ui/sv.lproj/RingWizardChoose.strings CONFLICT (content): Merge conflict in ui/sv.lproj/RingWizardChoose.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 i18n: update translations 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)2 months ago
First, rewinding head to replay your work on top of it... Applying: i18n: update translations Using index info to reconstruct a base tree... M ui/sv.lproj/RingWizardChoose.strings M ui/sv.lproj/RingWizardNewAccount.strings Falling back to patching base and 3-way merge... Auto-merging ui/sv.lproj/RingWizardNewAccount.strings CONFLICT (content): Merge conflict in ui/sv.lproj/RingWizardNewAccount.strings Auto-merging ui/sv.lproj/RingWizardChoose.strings CONFLICT (content): Merge conflict in ui/sv.lproj/RingWizardChoose.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 i18n: update translations 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)2 months ago
hardwired