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)
None
thewitness