Problems with Linux next tree

[Lucas Tanure]

So the best way is from Alexey Tulia.

My setup:
Clone linux-next tree.
Never ever commit something in master branch. Or even modify files.
Just keep master branch sync with remote linux-next.

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

Thanks!


--
Lucas Tanure
+55 (19) 988176559


On Tue, Jul 15, 2014 at 10:16 AM, Varka Bhadram <varkabhadram at gmail.com>
wrote:

> On 07/15/2014 01:28 AM, 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.
> >
> I think on your local tree you are having uncommitted changes..
>
> check with 'git status'
>
> --
> Regards,
> Varka Bhadram.
>
>
> _______________________________________________
> Kernelnewbies mailing list
> Kernelnewbies at kernelnewbies.org
> http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20140715/d3a5e923/attachment.html