From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 27 May 2021 14:00:00 GMT
Subject: Re: fast forward merge overwriting my code
Message-ID: <60afa5e07bcd9_2056d2084d@natae.notmuch>
In-Reply-To: <02bbe080-cd8a-cc7d-5dbc-9231b51c4baf@iee.email>

Philip Oakley wrote:
> On 27/05/2021 00:34, Felipe Contreras wrote:
> > Yes, but that is a separate issue.
> >
> > Right now they are able to resolve conflicts with a jupyter mergetool.
> 
> I don't believe that ("resolve") is true in the sense they would like. I
> don't think they are really 'merging' in an all-in-one `git merge`
> sense, rather they are [trying to] splitting and patching and commenting
> the changes.

He explicitly mentioned a merge, but ultimately it doesn't matter, the
mergetool can be used in other scenarios, like `git am`.

I did try to setup those tools, nbdime does setup a merge tool [1].

Cheers.

[1] https://nbdime.readthedocs.io/en/latest/

-- 
Felipe Contreras