Re: Rebase

From: D. Ben Knoble <ben.knoble@gmail.com>
Date: Jan 19, 2025, 23:08 UTC
Message-ID: <CALnO6CDwL3XHwMhHbX+7C87-pX+RBRDt3djKfr3LpqTFKpPV1A@mail.gmail.com>
In-Reply-To: <CAODtcdfS+TVmrwohtHFUXRZRwC1WmF5ENpZLVoZTyJgA--SC-Q@mail.gmail.com>

On Sun, Jan 19, 2025 at 3:39 PM Al Grant <bigal.nz@gmail.com> wrote:

>
> Yes. But I'm keen to understand how to deal with a merge conflict.

[and also]

> Which I have now aborted. I dont understand why I even have to deal

with merge conflicts when I want to keep the code in feature and make it main.

I recommend reading the book, esp. https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts. There is also an advanced section https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging.

As for why you get a merge conflict when rebasing, see for example the StackOverflow about rebase using a 3-way merge (https://stackoverflow.com/q/36993683/4400820) or part of the remembering-renames documentation (https://git-scm.com/docs/remembering-renames, but it renders poorly, so also try `open $(git --html-path)/technical/remembering-renames.txt`, substituting `open` for your platform equivalent).

-- 
D. Ben Knoble