pepopowitz’s Twitter Archive—№ 2,647

@jamonholmgren Every time I see "theirs" and "ours" I have to talk myself slowly and carefully through which is which. It is the worst thing about git. I wonder if it would be easier if "ours" and "theirs" had consistent meanings between rebasing vs merging.