From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Kyle Meyer <kyle@kyleam.com>
Cc: guix-devel@gnu.org
Subject: Re: WARNING: Git merges are tricky. Rebasing is better?
Date: Wed, 02 Feb 2022 09:19:44 -0500 [thread overview]
Message-ID: <87bkzpz6yn.fsf@gmail.com> (raw)
In-Reply-To: <87czkqne5i.fsf@kyleam.com> (Kyle Meyer's message of "Mon, 17 Jan 2022 18:19:53 -0500")
Hello Kyle and Leo,
Kyle Meyer <kyle@kyleam.com> writes:
> Leo Famulari writes:
>
>> On Mon, Jan 17, 2022 at 05:26:08PM -0500, Kyle Meyer wrote:
>>> Fwiw I don't think Git automatically resolved that conflict:
>>>
>>> $ git checkout 276f40fdc349d2ad62582b23ea55e061b689cfc0^
>>> $ git merge 276f40fdc349d2ad62582b23ea55e061b689cfc0^2
>> [...]
>>> ++<<<<<<< HEAD
>>> + "0r7m34xzz3shdfxf2abxb069izak3yv3ijlg29qy4pfmyawkilfs"))
>>> + (patches
>>> + (search-patches "epiphany-update-libportal-usage.patch"))))
>>> ++||||||| d91de53caa
>>> ++ "0r7m34xzz3shdfxf2abxb069izak3yv3ijlg29qy4pfmyawkilfs"))))
>>> ++
>>> ++=======
>>> + "0k7b22zq3z1kllzqxgwsvwb1lp0j6rjb3k1hvhna3i573wc4mpji"))))
>>> +
>>> ++>>>>>>> 276f40fdc349d2ad62582b23ea55e061b689cfc0^2
>>
>> So, you think it was a mistake made when resolving conflicts by hand? I
>> can certainly understand that.
>
> Yes.
>
>> Either way, it's bad that the Git history doesn't show these types of
>> changes.
>
> Right, inspecting merge results can be confusing. By default that
> change is pruned from diffs as "uninteresting" because the merge result
> matched the content in one of the parents (discussed in the "COMBINED
> DIFF FORMAT" section of git-diff's manpage and the --diff-merges
> description of git-show's manpage).
>
> $ git show 276f40fd | grep 0r7m34xzz
> $ git show --diff-merges=combined 276f40fd | grep 0r7m34xzz
> + "0r7m34xzz3shdfxf2abxb069izak3yv3ijlg29qy4pfmyawkilfs"))
Thanks for this interesting discussion, and apologies for mis-resolving
the conflict :-)
Maxim
prev parent reply other threads:[~2022-02-02 15:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-17 21:46 WARNING: Git merges are tricky. Rebasing is better? Leo Famulari
2022-01-17 22:26 ` Kyle Meyer
2022-01-17 23:00 ` Leo Famulari
2022-01-17 23:19 ` Kyle Meyer
2022-02-02 14:19 ` Maxim Cournoyer [this message]
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: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bkzpz6yn.fsf@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=guix-devel@gnu.org \
--cc=kyle@kyleam.com \
/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://git.savannah.gnu.org/cgit/guix.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).