iilab / contentascode

Content as Code
http://iilab.github.io/contentascode
GNU General Public License v3.0
34 stars 7 forks source link

Merges and other difficult concepts #30

Open jmatsushita opened 8 years ago

jmatsushita commented 8 years ago

Despite trying to create a smaller language for version control than git, some abstractions will need to be exposed especially when dealing with conflicts and merges.

If the UI would expose choices based on graphical representation like here https://developer.atlassian.com/blog/2014/12/pull-request-merge-strategies-the-great-debate/

It might make these concepts easier to grasp.

There's a need to look at the range of main and corner cases such as: