delorie.com/archives/browse.cgi | search |
On Mar 18, 2015, at 11:10 AM, Peter Stuge <peter AT stuge DOT se> wrote: > If a file is commonly conflicted there will be conflicts regardless > of what tools are used. > > I understand prefering file locking over having to do post-mortem > conflict resolution, At least in my experience, the “somebody locked the file and then got distracted” problem is far more trouble than conflict resolution. John Doty Noqsi Aerospace, Ltd. http://www.noqsi.com/ jpd AT noqsi DOT com
webmaster | delorie software privacy |
Copyright © 2019 by DJ Delorie | Updated Jul 2019 |