Re: [PATCH v4 18/25] sequencer: do not try to commit when there were merge conflicts

2016-10-21 Thread Johannes Schindelin
Hi Junio, On Thu, 20 Oct 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > The return value of do_recursive_merge() may be positive (indicating merge > > conflicts), or 0 (indicating success). It also may be negative, indicating > > a fatal error that

Re: [PATCH v4 18/25] sequencer: do not try to commit when there were merge conflicts

2016-10-20 Thread Junio C Hamano
Johannes Schindelin writes: > The return value of do_recursive_merge() may be positive (indicating merge > conflicts), or 0 (indicating success). It also may be negative, indicating > a fatal error that requires us to abort. > > Now, if the return value indicates that

[PATCH v4 18/25] sequencer: do not try to commit when there were merge conflicts

2016-10-14 Thread Johannes Schindelin
The return value of do_recursive_merge() may be positive (indicating merge conflicts), or 0 (indicating success). It also may be negative, indicating a fatal error that requires us to abort. Now, if the return value indicates that there are merge conflicts, we should not try to commit those