adminAuto-merging test/test_helper.rb Auto-merging test/controllers/plannings_controller_test.rb CONFLICT (content): Merge conflict in test/controllers/plannings_controller_test.rb Auto-merging lib/optim/optimizer_wrapper.rb Auto-merging lib/devices/fleet_demo.rb CONFLICT (add/add): Merge conflict in lib/devices/fleet_demo.rb Auto-merging docker/docker-compose.yml Auto-merging db/structure.sql CONFLICT (content): Merge conflict in db/structure.sql Auto-merging db/migrate/20171116151624_alter_database_transaction_isolation_level.rb CONFLICT (add/add): Merge conflict in db/migrate/20171116151624_alter_database_transaction_isolation_level.rb Auto-merging config/locales/pt.yml CONFLICT (content): Merge conflict in config/locales/pt.yml Auto-merging config/locales/fr.yml CONFLICT (content): Merge conflict in config/locales/fr.yml Auto-merging config/locales/fr.devices.yml CONFLICT (content): Merge conflict in config/locales/fr.devices.yml Auto-merging config/locales/en.yml CONFLICT (content): Merge conflict in config/locales/en.yml Auto-merging config/locales/en.devices.yml CONFLICT (content): Merge conflict in config/locales/en.devices.yml Auto-merging config/environments/test.rb CONFLICT (content): Merge conflict in config/environments/test.rb Auto-merging config/environments/production.rb Auto-merging config/environments/development.rb Auto-merging config/application.rb CONFLICT (content): Merge conflict in config/application.rb Removing app/views/user_mailer/subscribe.erb Auto-merging app/views/user_mailer/documentation_base.html.erb Auto-merging app/views/user_mailer/adds/_panel_two_features_links.html.erb Auto-merging app/views/user_mailer/adds/_panel_two_advanced_options_links.html.erb Auto-merging app/views/user_mailer/adds/_panel_three_features_links.html.erb Removing app/views/user_mailer/adds/_panel_three_advanced_options_links.erb Auto-merging app/views/user_mailer/adds/_panel_one_features_links.html.erb Removing app/views/user_mailer/accompanying.erb Auto-merging app/views/plannings/show.json.jbuilder Auto-merging app/views/plannings/_edit.html.erb Auto-merging app/views/customers/_form.html.erb Auto-merging app/templates/stops/_show.mustache Auto-merging app/templates/stops/_list.mustache Auto-merging app/templates/routes/_edit.mustache CONFLICT (content): Merge conflict in app/templates/routes/_edit.mustache Auto-merging app/services/fleet_demo_service.rb CONFLICT (add/add): Merge conflict in app/services/fleet_demo_service.rb Auto-merging app/models/vehicle.rb Auto-merging app/jobs/optimizer_job.rb CONFLICT (content): Merge conflict in app/jobs/optimizer_job.rb Auto-merging app/jobs/optimizer.rb CONFLICT (content): Merge conflict in app/jobs/optimizer.rb Auto-merging app/controllers/vehicle_usage_sets_controller.rb Auto-merging app/controllers/plannings_controller.rb CONFLICT (content): Merge conflict in app/controllers/plannings_controller.rb Auto-merging app/controllers/destinations_controller.rb Auto-merging app/controllers/customers_controller.rb Auto-merging app/controllers/application_controller.rb CONFLICT (content): Merge conflict in app/controllers/application_controller.rb Auto-merging app/assets/javascripts/routes_layers.js Auto-merging app/assets/javascripts/plannings.js Auto-merging app/assets/javascripts/customers.js CONFLICT (content): Merge conflict in app/assets/javascripts/customers.js Auto-merging app/api/v01/vehicles.rb CONFLICT (content): Merge conflict in app/api/v01/vehicles.rb Auto-merging app/api/v01/api.rb CONFLICT (content): Merge conflict in app/api/v01/api.rb Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago