Re: Resolve merge conflicts

From: Graham Perrin <grahamperrin_at_gmail.com>
Date: Mon, 14 Aug 2023 18:22:49 UTC 
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.)