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

On 14/08/2023 18:22, Warner Losh wrote:
> … Generally, I do a 'git rebase -i main $BRANCH' and then …


Thanks.

<https://reviews.freebsd.org/P609$20-21>; lines 20 and 21, I never 
figured out whether it's possible to rebase against freebsd main.

(Alone, git -C /usr/doc rebase is against my fork.)

--------------IqeTbsvtORv2mia1QeruZYVt
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;">
    <div class="moz-cite-prefix">On 14/08/2023 18:22, Warner Losh wrote:<br>
    </div>
    <blockquote type="cite"
cite="mid:CANCZdfrKkvmjfB3LGxctV6HtEQNsDXnsuKYsno_gBti_kZHqkw@mail.gmail.com">…
      Generally, I do a 'git rebase -i main $BRANCH' and then …<br>
    </blockquote>
    <p><br>
    </p>
    <p>Thanks.</p>
    <p><a class="moz-txt-link-rfc2396E" href="https://reviews.freebsd.org/P609$20-21">&lt;https://reviews.freebsd.org/P609$20-21&gt;</a>; lines 20 and 21, I
      never figured out whether it's possible to rebase against freebsd
      main. <br>
    </p>
    <p>(Alone, <font face="monospace">git -C /usr/doc rebase</font> is
      against my fork.)<br>
    </p>
  </body>
  <lt-container></lt-container>
</html>

--------------IqeTbsvtORv2mia1QeruZYVt--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?d23f88be-b8fd-451e-42e7-2c1e9309f3d7>