From: Christian Couder <christian.couder@gmail.com>
Date: Sat, 13 Jun 2020 12:08:31 GMT
Subject: Re: Collaborative conflict resolution feature request
Message-ID: <CAP8UFD3m9ANt6UOyOoMDy2haTJjhzL5ctFiki46ktgH3RLPqjA@mail.gmail.com>
In-Reply-To: <BY5PR19MB3400EB9AD87DFE612AFD5CC390810@BY5PR19MB3400.namprd19.prod.outlook.com>

Hi,

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

> 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.