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

[minde...@gmail.com]

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.

[David Lechner]

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

--
For more options, visit http://beagleboard.org/discuss
---
You received this message because you are subscribed to the Google Groups "BeagleBoard" group.
To unsubscribe from this group and stop receiving emails from it, send an email to beagleboard...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/beagleboard/a477c297-e771-460c-95cb-73f3d2006504%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[minde...@gmail.com]

On Monday, January 15, 2018 at 12:23:55 AM UTC+5:30, David Lechner wrote:

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

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.

[Robert Nelson]

On Thu, Jan 18, 2018 at 2:30 PM, <minde...@gmail.com> wrote:
>
>
> On Monday, January 15, 2018 at 12:23:55 AM UTC+5:30, David Lechner wrote:
>>
>> Each new release is rebased, not merged, so you need to also rebase your
>> work instead of pulling (merging).
>
>
> I am kind of confused. My current branch is 4.4
>
> I did the following:
>
> git checkout master
> git fetch
> git checkout 4.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,

--
Robert Nelson
https://rcn-ee.com/