to be fair, I think commenting code in a sense &quot;works better&quot; then &quot;git revert&quot; because you don&#x27;t need to solve conflicts, you just keep writing code around the commented one.<p>I rationally know that I can remove and re-add it later and that commit&#x2F;revert is <i>better</i>, but the pain associated with solving conflicts is strong enough that I subconsciously want to avoid it.