From: Junio C Hamano Date: Thu, 24 May 2018 10:02:51 GMT Subject: Re: [RFC/PATCH 5/7] rerere: only return whether a path has conflicts or not Message-ID: In-Reply-To: <20180520211210.1248-6-t.gummerer@gmail.com> Thomas Gummerer writes: > We currently return the exact number of conflict hunks a certain path > has from the 'handle_paths' function. However all of its callers only > care whether there are conflicts or not or if there is an error. > Return only that information, and document that only that information > is returned. This will simplify the code in the subsequent steps. Makes sense.