gitmerge
-
I’d Rather Merge a Month-Old Feature Branch Than Make a Phone Call
There are only two kinds of fear in the developer world: And if you gave me the choice between resolving thirty “both modified in HEAD” conflicts and calling someone to “just check on that status,” I’m picking the merge every single time. Because at least Git errors make sense eventually. Humans? Not so much. Why… Read more