Vincent van Ravesteijn wrote: >> the only way how to reasonably avoid merge conflicts which are >> unresolvable by >> the normal user. > > That's why my colleagues just send me the new file: "If you want to do > version control, well here is the file and commit it then".
well, the point was that i was successful to make them using it even without noticing the stuff which is going in the background... > I don't even understand this locking thing. Does it mean I can't edit a > file when someone else has locked it. exactly. >So, that means I have to stare outside until the other one is finished :S.... thats why one parcel the master into more childs... > P.S. If you get merge conflicts, then you already did something wrong > elsewhere, because you're either doing the same work, or you're working in > two different directions. hehehe. you should really try to use it in a real life. just consider we are having different header for lyx 1.6.4, lyx 1.6.5, so single resave will do MC under some scenarios etc. secondary your co-authors do technically 'something wrong' all the time unless they are computer geeks, so forget about your ideal world... i see typo i just correct it, right? :D we are going to the endless flame, because - basicaly - there is _no_ perfect solution as far as version control is concerned. concurrent editing is far from our reach now either. pavel
