From: Harald Nordgren Date: Mon, 31 Aug 2026 10:18:08 GMT Subject: Re: [PATCH 1/2] sequencer: teach autostash apply to report conflicts Message-ID: In-Reply-To: > > Add a conflicted parameter to apply_save_autostash_oid() and > > apply_save_autostash_ref() so callers can learn whether applying the > > stash resulted in conflicts. Thread the parameter through > > apply_autostash_ref() and update existing callers to pass NULL. > > It would be nicer to use the return value to indicate > success/error/conflicts rather than adding yet another parameter. Apart > from that this looks good. Is the int flexible enough to separate autostash conflict from other errors? Or should we introduce an enum here? Harald