Noneerror: Your local changes to the following files would be overwritten by checkout: locales/po/ar-SA.po locales/po/bg-BG.po locales/po/de-DE.po locales/po/el-GR.po locales/po/es-ES.po locales/po/fr-FR.po locales/po/he-IL.po locales/po/hi-IN.po locales/po/it-IT.po locales/po/ja-JP.po locales/po/ko-KR.po locales/po/nl-NL.po locales/po/pl-PL.po locales/po/pt-BR.po locales/po/pt-PT.po locales/po/ru-RU.po locales/po/sv-SE.po locales/po/tr-TR.po locales/po/vi-VN.po locales/po/zh-CN.po locales/po/zh-TW.po Please commit your changes or stash them before you switch branches. Aborting (1)3 years ago
thewitnessFirst, rewinding head to replay your work on top of it... Applying: Update translation files Using index info to reconstruct a base tree... M locales/po/cacti.pot Falling back to patching base and 3-way merge... Auto-merging locales/po/cacti.pot CONFLICT (content): Merge conflict in locales/po/cacti.pot error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Update translation files 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
First, rewinding head to replay your work on top of it... Applying: Update translation files Using index info to reconstruct a base tree... M locales/po/cacti.pot Falling back to patching base and 3-way merge... Auto-merging locales/po/cacti.pot CONFLICT (content): Merge conflict in locales/po/cacti.pot error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Update translation files 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