26
dfox
9y

Today I was talking about merge conflicts with a group of devs. One of them asked if any of us had ever rushed to merge a PR before another dev could merge their PR, knowing there were going to be conflicts. Some were more ashamed to admit it than others, but in the end everyone was guilty of doing it at least once :)

Anyone ever do that to avoid being the one who has to resolve a conflict?

Comments
  • 3
    Aww yeah. Only if the feature was more important on the timeline. But yeah. It's like leaving the kid with your spouse and you pretend not to notice they pooped themselves silly. "Oh no! Oh man, that's terrible...I had no idea"
  • 6
    Hahaha! Then there's the troll who will merge and message you "have fun resolving!!"
Add Comment