News for hackers. Stuff that matters.

A comment on Is Git Irreplaceable? (2019). Parent comment

Re:Is Git Irreplaceable? (2019) by jamil7 on Tuesday January 07, 2020 @04:25AM (#21978359)
I've worked in teams where developers seemed terrified of merge conflicts, to the point of telling eachother not to edit a particular file which seems absurd. Maybe I don't know any better but they seem like part of life.
[ Parent | on HN ]
Re:Is Git Irreplaceable? (2019) by int_19h on Tuesday January 07, 2020 @05:13AM (#21978603)
When at least one person is making changes that touch large parts of the file, it's very sensible to ask others to not touch it, if you don't want to spend hours merging it manually later.
[ Parent | on HN ]