From: Leo Famulari <leo@famulari.name>
To: Kyle Meyer <kyle@kyleam.com>
Cc: guix-devel@gnu.org
Subject: Re: WARNING: Git merges are tricky. Rebasing is better?
Date: Mon, 17 Jan 2022 18:00:07 -0500 [thread overview]
Message-ID: <YeX096eiGizOxKYb@jasmine.lan> (raw)
In-Reply-To: <87fspmngn3.fsf@kyleam.com>
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.
Either way, it's bad that the Git history doesn't show these types of
changes.
next prev parent reply other threads:[~2022-01-17 23:04 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 [this message]
2022-01-17 23:19 ` Kyle Meyer
2022-02-02 14:19 ` Maxim Cournoyer
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YeX096eiGizOxKYb@jasmine.lan \
--to=leo@famulari.name \
--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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.