git – ours vs theirs

Cheat sheet to demystify git terminology: What’s ‘ours’, what’s ‘theirs’? The answer might surprise you.

► nitaym.github.io