title: Merge conflicts updating from upstream
body: <p>I'm trying to get started with git on a github project. (I've been using CVS, SVN and hg for years; git is hard to get my head around). I'm following the instructions as precisely as I can and simply cannot make it work.</p>
  
  <p>I clone my forked project:</p>
  
  <pre><code>git clone git@github.com:davidgiven/linux-allwinner.git
  </code></pre>
  
  <p>As recommended, I add an 'upstream' remote that tracks the project that my one is forked from:</p>
  
  <pre><code>git remote add upstream https://github.com/amery/linux-allwinner.git
  </code></pre>
  
  <p>I fetch from it:</p>
  
  <pre><code>git fetch upstream
  </code></pre>
  
  <p>All this works fine. But, it's been a week or so since I forked the project, and upstream have been making changes. So I want to pull in those changes. I'm currently in the right branch --- allwinner-v3.0-android-v2 --- so I merge from upstream into my branch:</p>
  
  <pre><code>git merge upstream/allwinner-v3.0-android-v2
  </code></pre>
  
  <p>...and I get merge conflicts.</p>
  
  <pre><code>CONFLICT (add/add): Merge conflict in arch/arm/mach-sun5i/pm/standby/common.h
  CONFLICT (add/add): Merge conflict in arch/arm/mach-sun5i/pm/standby/Makefile
  CONFLICT (add/add): Merge conflict in arch/arm/mach-sun5i/pm/standby.S
  CONFLICT (add/add): Merge conflict in arch/arm/mach-sun5i/pm/Makefile
  [etc]
  </code></pre>
  
  <p>Now, I've checked in <em>nothing</em>; I haven't started work yet, and my project is completely untouched since I forked it. Therefore it should not be possible to have any conflicts. But there are some; what's going on, and how do I fix it?</p>
  
  <p><strong>Update:</strong></p>
  
  <p><code>git show-branch HEAD upstream/allwinner-v3.0-android-v2</code> shows this, which I have to say I don't understand a word of:</p>
  
  <pre><code>! [HEAD] arm: sun3i: add getioaddr macro
   ! [upstream/allwinner-v3.0-android-v2] arm: sun3i: updated irq handling and machine_desc to 3.0
  --
   + [upstream/allwinner-v3.0-android-v2] arm: sun3i: updated irq handling and machine_desc to 3.0
   + [upstream/allwinner-v3.0-android-v2^] arm: sunxi: renable early_printk in all _defconfig except crane's
  +  [HEAD] arm: sun3i: add getioaddr macro
  +  [HEAD^] arm: sun3i: add dummy machine type
  </code></pre>