4 ms·
Sometimes locking out files on complex changes has a better outcome than a modify-merge cycle I have found. This doesn't scale out to lots of engineers however.
by setquk 8y ago
Sometimes locking out files on complex changes has a better outcome than a modify-merge cycle I have found. This doesn't scale out to lots of engineers however.
If you're doing critical heavy lifting or refactoring, merging inline changes is hell.
- mikeash 8y agoEvery team I’ve worked with has had an informal locking method that gets used for really disruptive work. Instead of locking files in the VCS, you tell everybody that you’re going to be doing X, try not to make changes around that, and coordinate with that person if you really need to make changes on the same stuff. I think the informal technique works better since it’s a lot more flexible, but the basic concept is very useful.
- setquk 8y agoThat works until someone has a few beers at lunch and proceeds to come back and start smashing things (been there :)