From: Harald Nordgren Date: Fri, 02 Oct 2026 07:21:26 GMT Subject: Re: [PATCH] stash: allow custom conflict labels for pop Message-ID: In-Reply-To: > This is not a new problem, but is it just me who finds this > "feature" more about "because we can do it", not "because we need to > have it"? Stepping back a bit, why did we add these three options > to "stash apply" in the first place? > > If there is no good use case, perhaps what we should be doing is to > remove from "git stash apply" these three options, not adding the > same to another command. Let's scrap this. Would be interesting to remove it from 'apply' too. Can we "hide" it by keeping it but just not documenting it? Maybe that's a very bad idea. Harald