Problems with Linux next tree

[alexey.tulia@gmail.com (Alexey Tulia)]

Hi Lucas,

To follow changes to the linux-tree tree you need to first do a remote 
update (this will get all the changes from the remote linux-next branch 
to the local origin/master tracking branch) and then reset the HEAD 
pointer of current checked out branch to the HEAD of linux-next remote 
tracking branch (i.e origin/master).

$ git remote update
$ git reset --hard origin/master

This will make your current branch (master) *exactly* like the remote 
linux-next tree. You cannot do pull or merge from the remote tracking 
branch.

--
Alexey Tulia


On 07/14/2014 11:07 PM, Lucas Tanure wrote:
> Hi,
>
> My local clone of linux-tree always fails to update.
> When I run git pull origin master, I got a :
> Automatic merge failed; fix conflicts and then commit the result.
>
> So, How I can keep my local tree updated ? No matter what.
>
> Thanks
>
> --
> Lucas Tanure
> +55 (19) 988176559
>
> _______________________________________________
> Kernelnewbies mailing list
> Kernelnewbies at kernelnewbies.org
> http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
>