Merge conflict when I do a git pull on origin/V4.4

GoogleGroups
1

Hi,

Hope somebody can clear my confusion. I have pulled the kernel from https://github.com/beagleboard/linux. I am in origin/v4.4. I have compiled and built and have successfully run the kernel. After this I do a distclean and clean my working directory.

git status shows:

On branch 4.4
Your branch is up-to-date with ‘origin/4.4’.

nothing to commit, working tree clean

Now when I do a git pull I start getting merge conflicts. What is going on here? How can I do a successful git pull?

Thanks,
Gautam.

2

Each new release is rebased, not merged, so you need to also rebase your work instead of pulling (merging).

3

I am kind of confused. My current branch is 4.4

I did the following:

git checkout master
git fetch
git checkout 4.4

Now what should I rebase to?

-Gautam.

-Gautam.

4

git checkout master -f
git branch -D 4.4
git pull
git checkout 4.4 -b my-v4.4

side note, it's best to checkout the tag into your branch vs 4.4, as
the tag's once pushed never get overwritten..

Regards,