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?