For now, the easier way is to re-clone the tree. -- Lucas Tanure +55 (19) 988176559 On Mon, Jul 14, 2014 at 5:57 PM, Benedict Börger <benedict.boerger@xxxxxxxxx> wrote: > Hi Lucas, > > > On 14.07.2014 22:07, 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 >> > > First, you have to update your local copy with git fetch origin. > Then you can list all available tags with git tag -l next-*. The last one is > the latest one. Afterwards you can check it out with git checkout > next-WHATEVER. You are now in detached HEAD mode, so you maybe want to > create a new branch. > > > > Benedict _______________________________________________ Kernelnewbies mailing list Kernelnewbies@xxxxxxxxxxxxxxxxx http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
