From: Felipe Contreras <felipe.contreras@gmail.com>
To: Philip Oakley <philipoakley@iee.email>,
Felipe Contreras <felipe.contreras@gmail.com>,
Andre Ulrich <andre.ulrich@smail.fh-koeln.de>,
"brian m. carlson" <sandals@crustytoothpaste.net>
Cc: Johannes Sixt <j6t@kdbg.org>, Git Mailing List <git@vger.kernel.org>
Subject: Re: fast forward merge overwriting my code
Date: Thu, 27 May 2021 09:00:00 -0500 [thread overview]
Message-ID: <60afa5e07bcd9_2056d2084d@natae.notmuch> (raw)
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
next prev parent reply other threads:[~2021-05-27 14:00 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-22 15:48 fast forward merge overwriting my code Andre Ulrich
2021-05-22 17:12 ` Philip Oakley
2021-05-23 15:01 ` Junio C Hamano
2021-05-24 9:50 ` Philip Oakley
2021-05-23 9:48 ` Johannes Sixt
2021-05-23 23:58 ` brian m. carlson
2021-05-24 6:13 ` Andre Ulrich
2021-05-24 11:13 ` Bagas Sanjaya
2021-05-24 13:16 ` Philip Oakley
2021-05-24 15:06 ` Andre Ulrich
2021-05-24 18:48 ` Philip Oakley
2021-05-25 15:14 ` Philip Oakley
2021-05-30 5:31 ` David Aguilar
2021-05-30 11:00 ` Philip Oakley
2021-05-24 17:47 ` Igor Djordjevic
2021-05-26 2:53 ` Felipe Contreras
2021-05-26 11:06 ` Philip Oakley
2021-05-26 18:33 ` Felipe Contreras
2021-05-26 20:35 ` Philip Oakley
2021-05-26 23:34 ` Felipe Contreras
2021-05-27 12:05 ` Philip Oakley
2021-05-27 14:00 ` Felipe Contreras [this message]
2021-05-27 15:12 ` Philip Oakley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60afa5e07bcd9_2056d2084d@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=andre.ulrich@smail.fh-koeln.de \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=philipoakley@iee.email \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).