adminFirst, rewinding head to replay your work on top of it...
Applying: update zoning and import destination
.git/rebase-apply/patch:892: trailing whitespace.
:keywords:
.git/rebase-apply/patch:936: trailing whitespace.
.git/rebase-apply/patch:942: trailing whitespace.
.git/rebase-apply/patch:948: trailing whitespace.
.git/rebase-apply/patch:951: trailing whitespace.
warning: squelched 989 whitespace errors
warning: 994 lines add whitespace errors.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging source/locale/en/LC_MESSAGES/mtlive_manual/index.po
CONFLICT (add/add): Merge conflict in source/locale/en/LC_MESSAGES/mtlive_manual/index.po
Auto-merging source/locale/en/LC_MESSAGES/manual/08-advanced_options.po
CONFLICT (add/add): Merge conflict in source/locale/en/LC_MESSAGES/manual/08-advanced_options.po
Auto-merging source/locale/en/LC_MESSAGES/manual/06-plans.po
CONFLICT (add/add): Merge conflict in source/locale/en/LC_MESSAGES/manual/06-plans.po
Auto-merging source/locale/en/LC_MESSAGES/manual/05-zonings.po
CONFLICT (add/add): Merge conflict in source/locale/en/LC_MESSAGES/manual/05-zonings.po
Auto-merging source/locale/en/LC_MESSAGES/manual/04-destinations.po
CONFLICT (add/add): Merge conflict in source/locale/en/LC_MESSAGES/manual/04-destinations.po
Auto-merging source/locale/en/LC_MESSAGES/manual/02-global_settings_users.po
CONFLICT (add/add): Merge conflict in source/locale/en/LC_MESSAGES/manual/02-global_settings_users.po
Auto-merging source/locale/en/LC_MESSAGES/manual/01-start.po
CONFLICT (add/add): Merge conflict in source/locale/en/LC_MESSAGES/manual/01-start.po
Auto-merging source/locale/en/LC_MESSAGES/manual/00-before_start.po
CONFLICT (add/add): Merge conflict in source/locale/en/LC_MESSAGES/manual/00-before_start.po
Auto-merging source/locale/en/LC_MESSAGES/index.po
CONFLICT (add/add): Merge conflict in source/locale/en/LC_MESSAGES/index.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 update zoning and import destination
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)
5 years ago
Removing vendor/assets/javascripts/leaflet-pip.js Auto-merging test/test_helper.rb Removing docker/rails.env Removing docker/mapotempo.rb Removing docker/docker-compose.yml Removing docker/db.env Auto-merging config/locales/he.yml CONFLICT (content): Merge conflict in config/locales/he.yml Auto-merging config/application.rb CONFLICT (content): Merge conflict in config/application.rb Auto-merging app/controllers/plannings_controller.rb CONFLICT (content): Merge conflict in app/controllers/plannings_controller.rb Removing app/assets/javascripts/leaflet.draw.i18n.js Auto-merging app/assets/javascripts/destinations.js Auto-merging app/assets/javascripts/application.js CONFLICT (content): Merge conflict in app/assets/javascripts/application.js Auto-merging .travis.yml CONFLICT (content): Merge conflict in .travis.yml Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago
Removing vendor/assets/javascripts/leaflet-pip.js Auto-merging test/test_helper.rb Removing docker/rails.env Removing docker/mapotempo.rb Removing docker/docker-compose.yml Removing docker/db.env Auto-merging config/locales/he.yml CONFLICT (content): Merge conflict in config/locales/he.yml Auto-merging config/application.rb CONFLICT (content): Merge conflict in config/application.rb Auto-merging app/controllers/plannings_controller.rb CONFLICT (content): Merge conflict in app/controllers/plannings_controller.rb Removing app/assets/javascripts/leaflet.draw.i18n.js Auto-merging app/assets/javascripts/destinations.js Auto-merging app/assets/javascripts/application.js CONFLICT (content): Merge conflict in app/assets/javascripts/application.js Auto-merging .travis.yml CONFLICT (content): Merge conflict in .travis.yml Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago
Removing vendor/assets/javascripts/leaflet-pip.js Auto-merging test/test_helper.rb Removing docker/rails.env Removing docker/mapotempo.rb Removing docker/docker-compose.yml Removing docker/db.env Auto-merging config/locales/he.yml CONFLICT (content): Merge conflict in config/locales/he.yml Auto-merging config/application.rb CONFLICT (content): Merge conflict in config/application.rb Auto-merging app/controllers/plannings_controller.rb CONFLICT (content): Merge conflict in app/controllers/plannings_controller.rb Removing app/assets/javascripts/leaflet.draw.i18n.js Auto-merging app/assets/javascripts/destinations.js Auto-merging app/assets/javascripts/application.js CONFLICT (content): Merge conflict in app/assets/javascripts/application.js Auto-merging .travis.yml CONFLICT (content): Merge conflict in .travis.yml Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago
Auto-merging config/locales/he.yml CONFLICT (content): Merge conflict in config/locales/he.yml Auto-merging app/controllers/plannings_controller.rb CONFLICT (content): Merge conflict in app/controllers/plannings_controller.rb Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago