search

codeforamerica / chime

A city-focused content management system
http://chimecms.org/
BSD 3-Clause "New" or "Revised" License
35 stars 12 forks source link

Handle merge conflicts in a simplistic way #219

Open phae opened 9 years ago

phae commented 9 years ago

Ticket updated for actual working on.

phae commented 9 years ago

From discussion with @migurski:

  1. Throws a proper exception if a merge conflict is detected, instead of just falling over on its face.
  2. The exception should show a page telling the user a merge conflict was found.
  3. It should show what the differences are in the files that are different.
  4. It should let the user pick which one of the files they want to keep (whole files, not partials/single lines etc.).
  5. Jekit can preview either version, to help them make a decision.

This should do for first parse merge conflict handling.