Post

This is a "TIL" from a few weeks ago, I was 🤯 to learn that there were “ours" and "theirs" git merge strategies and finally got around to writing a short blog post about it. www.ericapisani.dev/til-ours-and...