Hi, On Fri, Jun 12, 2020 at 4:11 PM Curtin, Eric <Eric.Curtin@xxxxxxxx> wrote: > Is there any existing or upcoming feature in git that could help make conflict resolution a more distributed, collaborative kind of task? You might want to take a look at Michael Haggerty's 'git imerge': https://github.com/mhagger/git-imerge > I also opened this as an issue in github as I feel it could be solved by either tool potentiall: > > https://github.com/isaacs/github/issues/1816 I also made the same suggestion on the issue. Best, Christian.
