On 15/12/2017 20:09, Junio C Hamano wrote: > > > Junio, what about consecutive runs, while merge conflicts are still > > unresolved? > > The impression I got was that the original running with svn does not > deal with conflicting situation anyway, so I did not think about it > at all, and I personally do not care ;-) Heh, fair enough :) Though I was genuinely interested if there is a better way to accomplish it than `git add -u && git reset`, but I guess I can take that as "whatever works" ;)
