[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: WARNING: Git merges are tricky. Rebasing is better?
From: |
Leo Famulari |
Subject: |
Re: WARNING: Git merges are tricky. Rebasing is better? |
Date: |
Mon, 17 Jan 2022 18:00:07 -0500 |
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.