From: Junio C Hamano Date: Wed, 02 Sep 2026 19:52:30 GMT Subject: Re: [PATCH v4 2/2] checkout: separate autostash conflict advice from branch-switch message Message-ID: In-Reply-To: <935fa0a9ae69f269a8a79f213f02aa4ed1e8279b.1788373743.git.gitgitgadget@gmail.com> "Harald Nordgren via GitGitGadget" writes: > From: Harald Nordgren > > "git checkout -m" stashes the user's local changes when it cannot > perform the checkout, and then applies the stash. When applying the > stash results in conflicts, the advice on how to deal with them is > printed directly on top of the branch-switch message ("Switched to > branch ..."), making the two hard to tell apart. Print a blank line > in between so that the advice and the branch-switch message are > visually distinct. > > apply_autostash_ref() reports whether applying the stash resulted in > conflicts via its enum stash_apply_result return value, so only print > the blank line in the conflicted case. > > Signed-off-by: Harald Nordgren > --- > builtin/checkout.c | 15 +++++++++------ This iteration looks good to me.