title: Git Rebase Conflict: Who is HEAD?
body: <p>I have this project where the remote repo has the main development branch, and I have a fork containing the experimental branch. I'm required to <code>rebase</code> changes from the development branch to my experimental branch before I push to my fork. So it goes like:</p>
  
  <pre><code>git checkout experimentalbranch
  git fetch remoterepo
  git rebase remoterepo/developmentbranch
  </code></pre>
  
  <p>By this time, I hit conflicts. However, <em>I'm not familiar with any of these changes</em> (I'm rebasing weeks worth of changes, because they didn't merge my changes immediately). Also, it's my first time doing <code>rebase</code>. I'm more accustomed to <code>merge</code>.</p>
  
  <p>In meld, it usually is like <code>&lt;&lt;LOCAL||REMOTE&gt;&gt;</code> for <code>merge</code>, which sounds very intuitive. But in <code>rebase</code>, it's <code>&lt;&lt;HEAD||COMMIT MESSAGE&gt;&gt;</code>. Who is <code>HEAD</code>? Is it the <code>HEAD</code> of the development branch? Is it the latest code in the development branch or somewhere else?</p>