I don’t trust git’s built-in merge. It stinks. I’ve seen too much new work overwritten by old and I’ve seen too many merge “conflicts” where both parts were absolutely identical even unto whitespace. I use BeyondCompare.

My only rule for branches is to create as few of them as I can absolutely manage. No development branch, no release branch, never make a new one from any but master.

American Software Developer living in Vietnam. Classical musician (guitar, woodwinds), weightlifter, multilingual, misanthrope • XY

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store