From: Christian Couder <christian.couder@gmail.com>
Date: Tue, 16 Jun 2020 09:08:42 GMT
Subject: Re: Collaborative conflict resolution feature request
Message-ID: <CAP8UFD1y5uUkaHxtBfQFWoqXCKDod7Srfcnk0AHRVbrzit1DgQ@mail.gmail.com>
In-Reply-To: <CAP8UFD3m9ANt6UOyOoMDy2haTJjhzL5ctFiki46ktgH3RLPqjA@mail.gmail.com>

On Sat, Jun 13, 2020 at 2:08 PM Christian Couder
<christian.couder@gmail.com> wrote:
>
> On Fri, Jun 12, 2020 at 4:11 PM Curtin, Eric <Eric.Curtin@dell.com> 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