From: Chris Torek <chris.torek@gmail.com>
Date: Thu, 09 Apr 2026 23:49:49 GMT
Subject: Re: [PATCH v8 4/4] checkout: -m (--merge) uses autostash when switching branches
Message-ID: <CAPx1GvfGRx4rEEhqNbgsSKmW77o+uD2f+977cX_U_amyYdz8rg@mail.gmail.com>
In-Reply-To: <aa1831336297478e53ad1a2a2ab9246860181366.1775762235.git.gitgitgadget@gmail.com>

On Thu, Apr 9, 2026 at 12:18 PM Harald Nordgren via GitGitGadget
<gitgitgadget@gmail.com> wrote:
> ... If reapplying causes conflicts, the stash is
> kept and the user is told they can resolve and run "git stash drop",
> or run "git reset --hard" and later "git stash pop" to recover their
> changes.

I might suggest that this should recommend "git stash pop --index"
(either always, or if the stashed index differs from the stash's parent).

Chris