From mboxrd@z Thu Jan 1 00:00:00 1970 From: benedict.boerger@gmail.com (=?UTF-8?B?QmVuZWRpY3QgQsO2cmdlcg==?=) Date: Mon, 14 Jul 2014 22:57:25 +0200 Subject: Problems with Linux next tree In-Reply-To: References: Message-ID: <53C44435.5010709@gmail.com> To: kernelnewbies@lists.kernelnewbies.org List-Id: kernelnewbies.lists.kernelnewbies.org 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