Problems with Linux next tree

Lucas Tanure tanure at linux.com
Mon Jul 14 17:29:36 EDT 2014


Was easier and faster to re-clone. So I will try your command tomorrow
at another place, that internet sucks and I have the same issue.
But I tried also "git pull --rebase" , and worked too.
I need to understand git better too.

Thanks
--
Lucas Tanure
+55 (19) 988176559


On Mon, Jul 14, 2014 at 6:18 PM, Peter Senna Tschudin
<peter.senna at gmail.com> wrote:
> Lucas,
>
> What do you get if you do:
>
> $ git remote update
>
> On Mon, Jul 14, 2014 at 11:04 PM, Lucas Tanure <tanure at linux.com> wrote:
>> 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 at gmail.com> 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 at kernelnewbies.org
>> http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
>
>
>
> --
> Peter



More information about the Kernelnewbies mailing list