alahouzeFirst, rewinding head to replay your work on top of it... Applying: Add Raven Sentry client Using index info to reconstruct a base tree... M Gemfile M Gemfile.lock M app/api/v01/api.rb M app/assets/javascripts/application.js M app/controllers/application_controller.rb M app/jobs/geocoder_destinations_job.rb M app/jobs/geocoder_stores_job.rb M app/jobs/importer_base.rb M app/jobs/optimizer_job.rb M app/models/import_csv.rb M app/models/import_json.rb M app/models/import_tomtom.rb M app/views/layouts/_head.html.erb A config/initializers/beta.rb Falling back to patching base and 3-way merge... CONFLICT (modify/delete): config/initializers/beta.rb deleted in HEAD and modified in Add Raven Sentry client. Version Add Raven Sentry client of config/initializers/beta.rb left in tree. Auto-merging app/views/layouts/_head.html.erb CONFLICT (content): Merge conflict in app/views/layouts/_head.html.erb Auto-merging app/jobs/optimizer_job.rb CONFLICT (content): Merge conflict in app/jobs/optimizer_job.rb Auto-merging app/jobs/geocoder_stores_job.rb Auto-merging app/jobs/geocoder_destinations_job.rb CONFLICT (content): Merge conflict in app/jobs/geocoder_destinations_job.rb Auto-merging app/controllers/application_controller.rb CONFLICT (content): Merge conflict in app/controllers/application_controller.rb Auto-merging app/assets/javascripts/application.js Auto-merging app/api/v01/api.rb CONFLICT (content): Merge conflict in app/api/v01/api.rb Auto-merging Gemfile.lock CONFLICT (content): Merge conflict in Gemfile.lock Auto-merging Gemfile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Add Raven Sentry client 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)4 years ago
First, rewinding head to replay your work on top of it... Applying: Add Raven Sentry client Using index info to reconstruct a base tree... M Gemfile M Gemfile.lock M app/api/v01/api.rb M app/assets/javascripts/application.js M app/controllers/application_controller.rb M app/jobs/geocoder_destinations_job.rb M app/jobs/geocoder_stores_job.rb M app/jobs/importer_base.rb M app/jobs/optimizer_job.rb M app/models/import_csv.rb M app/models/import_json.rb M app/models/import_tomtom.rb M app/views/layouts/_head.html.erb A config/initializers/beta.rb Falling back to patching base and 3-way merge... CONFLICT (modify/delete): config/initializers/beta.rb deleted in HEAD and modified in Add Raven Sentry client. Version Add Raven Sentry client of config/initializers/beta.rb left in tree. Auto-merging app/views/layouts/_head.html.erb CONFLICT (content): Merge conflict in app/views/layouts/_head.html.erb Auto-merging app/jobs/optimizer_job.rb CONFLICT (content): Merge conflict in app/jobs/optimizer_job.rb Auto-merging app/jobs/geocoder_stores_job.rb Auto-merging app/jobs/geocoder_destinations_job.rb CONFLICT (content): Merge conflict in app/jobs/geocoder_destinations_job.rb Auto-merging app/controllers/application_controller.rb CONFLICT (content): Merge conflict in app/controllers/application_controller.rb Auto-merging app/assets/javascripts/application.js Auto-merging app/api/v01/api.rb CONFLICT (content): Merge conflict in app/api/v01/api.rb Auto-merging Gemfile.lock CONFLICT (content): Merge conflict in Gemfile.lock Auto-merging Gemfile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Add Raven Sentry client 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)4 years ago
First, rewinding head to replay your work on top of it... Applying: Add Raven Sentry client Using index info to reconstruct a base tree... M Gemfile M Gemfile.lock M app/api/v01/api.rb M app/assets/javascripts/application.js M app/controllers/application_controller.rb M app/jobs/geocoder_destinations_job.rb M app/jobs/geocoder_stores_job.rb M app/jobs/importer_base.rb M app/jobs/optimizer_job.rb M app/models/import_csv.rb M app/models/import_json.rb M app/models/import_tomtom.rb M app/views/layouts/_head.html.erb A config/initializers/beta.rb Falling back to patching base and 3-way merge... CONFLICT (modify/delete): config/initializers/beta.rb deleted in HEAD and modified in Add Raven Sentry client. Version Add Raven Sentry client of config/initializers/beta.rb left in tree. Auto-merging app/views/layouts/_head.html.erb CONFLICT (content): Merge conflict in app/views/layouts/_head.html.erb Auto-merging app/jobs/optimizer_job.rb CONFLICT (content): Merge conflict in app/jobs/optimizer_job.rb Auto-merging app/jobs/geocoder_stores_job.rb Auto-merging app/jobs/geocoder_destinations_job.rb CONFLICT (content): Merge conflict in app/jobs/geocoder_destinations_job.rb Auto-merging app/controllers/application_controller.rb CONFLICT (content): Merge conflict in app/controllers/application_controller.rb Auto-merging app/assets/javascripts/application.js Auto-merging app/api/v01/api.rb CONFLICT (content): Merge conflict in app/api/v01/api.rb Auto-merging Gemfile.lock CONFLICT (content): Merge conflict in Gemfile.lock Auto-merging Gemfile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Add Raven Sentry client 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)4 years ago