When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".

/private/var/www/apps/geneoapp.dev/geneo2 ((no branch)) $ git status
# Not currently on any branch.
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#   new file:   geneo_translation/locale/deu/LC_MESSAGES/geneo_translation.po
#   new file:   geneo_translation/locale/fre/LC_MESSAGES/geneo_translation.po
#   new file:   geneo_translation/locale/geneo_translation.pot
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#   both modified:      companies/locale/companies.pot
#   both modified:      companies/locale/deu/LC_MESSAGES/companies.po
#   both modified:      companies/locale/fre/LC_MESSAGES/companies.po
#   both modified:      departments/locale/departments.pot
#   both modified:      departments/locale/deu/LC_MESSAGES/departments.po
#   both modified:      departments/locale/fre/LC_MESSAGES/departments.po
#   both modified:      geneo/locale/deu/LC_MESSAGES/geneo.po
#   both modified:      geneo/locale/fre/LC_MESSAGES/geneo.po
#   both modified:      geneo/locale/geneo.pot
#   both modified:      geneo_alerts/locale/deu/LC_MESSAGES/geneo_alerts.po
#   both modified:      geneo_alerts/locale/fre/LC_MESSAGES/geneo_alerts.po
#   both modified:      geneo_alerts/locale/geneo_alerts.pot
#   both modified:      geneo_auth/locale/deu/LC_MESSAGES/geneo_auth.po
#   both modified:      geneo_auth/locale/fre/LC_MESSAGES/geneo_auth.po
#   both modified:      geneo_auth/locale/geneo_auth.pot
#   both modified:      geneo_business_units/locale/deu/LC_MESSAGES/geneo_business_units.po
#   both modified:      geneo_business_units/locale/fre/LC_MESSAGES/geneo_business_units.po
#   both modified:      geneo_business_units/locale/geneo_business_units.pot
#   both modified:      geneo_documents/locale/deu/LC_MESSAGES/geneo_documents.po
#   both modified:      geneo_documents/locale/fre/LC_MESSAGES/geneo_documents.po
#   both modified:      geneo_documents/locale/geneo_documents.pot
#   both modified:      geneo_images/locale/deu/LC_MESSAGES/geneo_images.po
#   both modified:      geneo_images/locale/fre/LC_MESSAGES/geneo_images.po
#   both modified:      geneo_images/locale/geneo_images.pot
#   both modified:      geneo_products/locale/deu/LC_MESSAGES/geneo_products.po
#   both modified:      geneo_products/locale/fre/LC_MESSAGES/geneo_products.po
#   both modified:      geneo_products/locale/geneo_products.pot
#   both modified:      geneo_skills_matrix/locale/deu/LC_MESSAGES/geneo_skills_matrix.po
#   both modified:      geneo_skills_matrix/locale/fre/LC_MESSAGES/geneo_skills_matrix.po
#   both modified:      geneo_skills_matrix/locale/geneo_skills_matrix.pot
#   both modified:      geneo_training/locale/deu/LC_MESSAGES/geneo_training.po
#   both modified:      geneo_training/locale/fre/LC_MESSAGES/geneo_training.po
#   both modified:      geneo_training/locale/geneo_training.pot
#   both modified:      locations/locale/deu/LC_MESSAGES/locations.po
#   both modified:      locations/locale/fre/LC_MESSAGES/locations.po
#   both modified:      locations/locale/locations.pot
#   both modified:      parts/locale/deu/LC_MESSAGES/parts.po
#   both modified:      parts/locale/fre/LC_MESSAGES/parts.po
#   both modified:      parts/locale/parts.pot
#   both modified:      safety/locale/deu/LC_MESSAGES/safety.po
#   both modified:      safety/locale/fre/LC_MESSAGES/safety.po
#   both modified:      safety/locale/safety.pot
#   both modified:      standardised_work/locale/deu/LC_MESSAGES/standardised_work.po
#   both modified:      standardised_work/locale/fre/LC_MESSAGES/standardised_work.po
#   both modified:      standardised_work/locale/standardised_work.pot
#   both modified:      tools/locale/deu/LC_MESSAGES/tools.po
#   both modified:      tools/locale/fre/LC_MESSAGES/tools.po
#   both modified:      tools/locale/tools.pot
#
/private/var/www/apps/geneoapp.dev/geneo2 ((no branch)) $