0

support/offer git-imerge incremental merge scheme for simplified conflict resolution

ck05 3 years ago 0
git-imerge tries to simplify merge conflict resolution by doing "incremental" merges. It would be great if SmartGit could also offer such a scheme to simplify testing of merge results