From: Duy Nguyen Date: Wed, 20 Mar 2019 13:57:54 GMT Subject: Re: [PATCH] checkout.txt: note about losing staged changes with --merge Message-ID: In-Reply-To: On Wed, Mar 20, 2019 at 8:53 PM Elijah Newren wrote: > So, I think we do need something (eventually at least). Would you > prefer we dropped this patch from Duy and instead made 'checkout -m' > abort when the index is dirty? I have no problem with this. Still scratching my head wondering if t7201-co.sh has a slightly incorrect setup, or aborting is actually wrong. You're probably a better person to understand that test case ;-) -- Duy