From: Julia Evans <julia@jvns.ca>
Date: Mon, 28 Sep 2026 20:41:54 GMT
Subject: Re: [PATCH 0/7] [doc] Add new page on merge conflicts
Message-ID: <01f196af-3a6a-40e6-86c9-f8b4ce7bfe47@app.fastmail.com>
In-Reply-To: <20260924233726.GB765100@coredump.intra.peff.net>

> I think that is giving us a good signal, though. The guide should be
> mentioned in command-list.txt, so that it is linked from git(1).

Thanks, will fix this (and will move the conflict-marker-size change).

Should I be trying to apply my patches to `seen` before submitting them?

- Julia