title: git - confusion over terminology, "theirs" vs "mine"
body: <p>I'm completely confused about what mine vs theirs means. In this specific case, I've got a feature branch where I just squashed about 80 commits via <code>rebase -i</code> and am merging this back into <code>develop</code>. I got a few conflicts, and I just want to use whatever code is on my feature branch. I tried "mine" but that actually seemed to do the opposite.</p>
  
  <p>Could someone shed some light on this terminology?</p>