Re: Resolve merge conflicts

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

From: Graham Perrin <grahamperrin_at_gmail.com>
Date: Mon, 14 Aug 2023 17:15:38 UTC

On 14/08/2023 18:03, Graham Perrin wrote:

> Re: <https://github.com/grahamperrin/freebsd-doc/tree/commercial> I 
> need to resolve merge conflicts. Visually:
>
> <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).