From: Patrick Steinhardt Date: Tue, 13 Oct 2026 11:07:55 GMT Subject: Re: [PATCH v3 5/6] doc: git-cherry-pick: link to new merge conflicts guide Message-ID: In-Reply-To: On Mon, Oct 12, 2026 at 02:53:14PM +0000, Julia Evans via GitGitGadget wrote: > From: Julia Evans > > Remove the discussion of merge conflicts and replace it with a link to > the guide. Nit: you don't really change the discussion anymore, so this commit message is inaccurate by now. Patrick