Re: [RFC/PATCH 5/7] rerere: only return whether a path has conflicts or not
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 24, 2018, 10:02 UTC
- Message-ID
- <xmqqin7dqsl0.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20180520211210.1248-6-t.gummerer@gmail.com>
Thomas Gummerer <t.gummerer@gmail.com> writes:
Show 5 quoted lines
> 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.