search

martinvonz / jj

A Git-compatible VCS that is both simple and powerful
https://martinvonz.github.io/jj/
Apache License 2.0
8.55k stars 293 forks source link

Add a way of resolving conflicts involving more than 3 parts #19

Open martinvonz opened 3 years ago

martinvonz commented 3 years ago

I plan to add the same kind of conflict markers I added to Mercurial in https://phab.mercurial-scm.org/D9551. However, something else is needed for resolving non-file conflicts (e.g. where one part added a regular file, one part added a symlink, one part added a directory). We will probably want some command for resolving conflicts.