Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 14 Aug 2023 18:15:38 +0100
From:      Graham Perrin <grahamperrin@gmail.com>
To:        freebsd-git <freebsd-git@freebsd.org>
Subject:   Re: Resolve merge conflicts
Message-ID:  <f2a930cd-eae8-cb28-9e94-7d5fa7801a31@gmail.com>
In-Reply-To: <e25f395a-825f-aaa4-fb86-d2fcc78a31d5@gmail.com>
References:  <e25f395a-825f-aaa4-fb86-d2fcc78a31d5@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help 
This is a multi-part message in MIME format.
--------------tBQHyCo7mK2NoBSY4j0MS7Tz
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit

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).

--------------tBQHyCo7mK2NoBSY4j0MS7Tz
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 8bit

<html data-lt-installed="true">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  </head>
  <body style="padding-bottom: 1px;">
    <p>On 14/08/2023 18:03, Graham Perrin wrote:<br>
    </p>
    <blockquote type="cite"
      cite="mid:e25f395a-825f-aaa4-fb86-d2fcc78a31d5@gmail.com">
      <p>Re: <a class="moz-txt-link-rfc2396E"
          href="https://github.com/grahamperrin/freebsd-doc/tree/commercial"
          moz-do-not-send="true">&lt;https://github.com/grahamperrin/freebsd-doc/tree/commercial&gt;</a>;
        I need to resolve merge conflicts. Visually: <br>
      </p>
      <p><a class="moz-txt-link-rfc2396E"
          href="https://i.imgur.com/6eZo8pP.png" moz-do-not-send="true">&lt;https://i.imgur.com/6eZo8pP.png&gt;</a></p>;
      <p> </p>
      <blockquote type="cite">… You can resolve merge conflicts using
        the command line and a text editor. …</blockquote>
      <p>It's so long since I did this, my mind is nearly blank. </p>
    </blockquote>
    <p>The conflicts no longer exist. <br>
    </p>
    <p>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). <br>
    </p>
  </body>
  <lt-container></lt-container>
</html>

--------------tBQHyCo7mK2NoBSY4j0MS7Tz--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?f2a930cd-eae8-cb28-9e94-7d5fa7801a31>