Problems with Linux next tree

Lucas Tanure ltanure at gmail.com
Mon Jul 14 15:58:35 EDT 2014


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 ?

Thanks

--
Lucas A. Tanure Alves
+55 (19) 988176559



More information about the Kernelnewbies mailing list