On Tue, Oct 16, 2012 at 10:57 PM, Angelo Borsotti <angelo.borsotti@xxxxxxxxx> wrote: > Hi Andrew, > > one nice thing is to warn a developer that wants to modify a source > file, that there is somebody else changing it beforehand. It is nicer > than discovering that at push time. Andrew: also see http://sitaramc.github.com/gitolite/locking.html for a way to do file locking (and enforce it) using gitolite. This does warn, as long as the user remembers to try to acquire a lock before working on a binary file. (You can't get around that requirement on a DVCS, sorry!) > Take into account that there are changes in files that may be > incompatible to each other, or that can be amenable to be > automatically merged producing wrong results. So, knowing it could > help. > > -Angelo > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Sitaram -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html