Failed merge on repository
Mapotempo App / Mapotempo App
Auto-merging lib/devices/fleet.rb Auto-merging config/locales/pt.yml Auto-merging config/locales/fr.yml CONFLICT (content): Merge conflict in config/locales/fr.yml Auto-merging config/locales/en.yml Auto-merging app/views/vehicle_usage_sets/show.excel.ruby Auto-merging app/views/vehicle_usage_sets/show.csv.ruby Auto-merging app/models/planning.rb Auto-merging app/jobs/importer_vehicle_usage_sets.rb Auto-merging app/controllers/plannings_controller.rb Automatic merge failed; fix conflicts and then commit the result. (1)
Committed changes
Mapotempo App / Mapotempo App — Portuguese
Pushed changes
Rebased repository
Failed rebase on repository
error: Failed to merge in the changes. (128)
Resource update
Mapotempo App / Mapotempo App — Hebrew
Mapotempo App / Mapotempo App — Persian
Mapotempo App / Mapotempo App — Spanish
Mapotempo App / Mapotempo App — English
Mapotempo App / Mapotempo App — Arabic
Merged repository
admin
None