Mike_@lemmy.catoProgramming@beehaw.org•How often do you have to resolve merge conflicts?
1·
1 year agoWith ~10 people on the team, many products, and dozens of repositories that we maintain, rarely. Maybe a few times per month. In the two years I’ve been with this company, I haven’t run into a single merge conflict that wasn’t straightforward to sort out.
Some of them could make sense to be reposted, but the overwhelming majority of them are useless because nobody is going to respond to them. I’m glad that blocking the bot hides all of these posts.