On Fri, Dec 15, 2017 at 11:09:17AM -0800, Junio C Hamano wrote: > Igor Djordjevic <igor.d.djordjevic@xxxxxxxxx> writes: > > > 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 ;-) Yeah. Conflicts are not a big deal for this project. I guess, this would no longer hold true if there are lots of developers with lots of commits. Thus, I'd still like to learn how to do it correctly. Never doing local modifications in the "live" directories would require to install test systems and simulate their environment just for doing some minor adjustments. -- Josef Wolf jw@xxxxxxxxxxxxx
