Re: linux-next: manual merge of the nfsd tree with the nfsd-fixes tree
From: Stephen Rothwell
Date: Fri Jan 05 2024 - 19:45:47 EST
Hi Chuck,
On Sat, 6 Jan 2024 00:26:53 +0000 Chuck Lever III <chuck.lever@xxxxxxxxxx> wrote:
>
> My development toolchain is stgit, where rebasing is butt-
> simple.
>
> I'm not smart enough to make all that work out, and merges
> make my head hurt. That's why I let you and Linus handle it,
> and then never rebase once my PRs are merged into
> torvalds/linux.git.
>
> I'm open to learning more, but I might resist making my dev
> workflow more complicated.
Understood, but if you are interested, see
Documentation/maintainer/rebasing-and-merging.rst
--
Cheers,
Stephen Rothwell
Attachment:
pgp_icWSVZzaG.pgp
Description: OpenPGP digital signature