Merge conflicts updating from upstream

Question

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. I clone my forked project: ``` git clone git@github.com:davidgiven/linux-allwinner.git ``` As recommended, I add an 'upstream' remote that tracks the project that my one is forked from: ``` git remote add upstream https://github.com/amery/linux-allwinner.git ``` I fetch from it: ``` git fetch upstream ``` 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: ``` git merge upstream/allwinner-v3.0-android-v2 ``` ...and I get merge conflicts. ``` CONFLICT (add/add): Merge conflict in arch/arm/mach-sun5i/pm/standby/common.h CONFLICT (add/add): Merge conflict in arch/ar…

Accepted Answer

It could be, that upstream has rewritten history (rebase, amend, …) – they shouldn't do that, but you'll never know.

Since you say you don't have any local changes or commits, you should bring your repository back to a clean state by resetting your branch:

```
git reset --hard upstream/allwinner-v3.0-android-v2
```

(This will discard any local changes and make commits of current HEAD unreachable!)

The above assumes that you will (force) push the newly reset state of your branch to your remote repository, otherwise you will encounter the conflicts again when you try to pull from `origin`.

```
git push origin +allwinner-v3.0-android-v2
```

If you already had committed yourself locally, you'd have to rebase (or cherry-pick) your commits on top of the upstream branch, and then do a push to origin. That way you will re-write your local history the same way upstream did and apply your changes on top, i.e.:

```
git rebase --onto upstream/branch \
  last-original-upstream-commit-before-yours \
  your-branch
```

Merge conflicts updating from upstream

Solution

Problem