Re: Resolve merge conflicts

Reply: Graham Perrin : "Re: Resolve merge conflicts"
In reply to: Graham Perrin : "Re: Resolve merge conflicts"
Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Warner Losh <imp_at_bsdimp.com>
Date: Mon, 14 Aug 2023 17:22:09 UTC

On Mon, Aug 14, 2023 at 11:15 AM Graham Perrin <grahamperrin@gmail.com>
wrote:

> On 14/08/2023 18:03, Graham Perrin wrote:
>
> Re: <https://github.com/grahamperrin/freebsd-doc/tree/commercial>
> <https://github.com/grahamperrin/freebsd-doc/tree/commercial> I need to
> resolve merge conflicts. Visually:
>
> <https://i.imgur.com/6eZo8pP.png> <https://i.imgur.com/6eZo8pP.png>
>
> … You can resolve merge conflicts using the command line and a text
> editor. …
>
> It's so long since I did this, my mind is nearly blank.
>
> The conflicts no longer exist.
>
> Maybe some lag with GitHub, even after a refresh of the page (the
> screenshot above was taken around eleven minutes after a merge without
> conflict)
>

Generally, I do a 'git rebase -i main $BRANCH' and then hop into emacs to
see if I can work out the three way merge detritus to see what I need to
add.
Not the greatest instructions, I know, but they often have been enough for
others to make progress.

Warner