On Sat, Jun 13, 2020 at 2:08 PM Christian Couder <christian.couder@xxxxxxxxx> wrote: > > 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 Not sure if it could be useful in your case but some people also like a tool called git-mediate See: - https://github.com/Peaker/git-mediate - https://medium.com/@yairchu/how-git-mediate-made-me-stop-fearing-merge-conflicts-and-start-treating-them-like-an-easy-game-of-a2c71b919984
