Problems with Linux next tree

Problems with Linux next tree

[Lucas Tanure]

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

Problems with Linux next tree

[Lucas Tanure]

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

--
Lucas Tanure
+55 (19) 988176559

Problems with Linux next tree

[Prabhakar Lad]

Hi Lucas,

On Mon, Jul 14, 2014 at 9:07 PM, Lucas Tanure <tanure@linux.com> 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.
>
Form the above message looks like you have done some modifications to your
branch which is conflicting with the git pull.
> So, How I can keep my local tree updated ? No matter what.
>
so you have to create a patch of your modifications reset the HEAD and then
do a git pull and then later apply your patch.

Thanks,
--Prabhakar Lad

Problems with Linux next tree

[Lucas Tanure]

Hi,

No I didn't. It is a clean linux-next tree.
Turns out that if I don't update every day I got this issue.

So, no solution yet.

Thanks
--
Lucas Tanure
+55 (19) 988176559


On Mon, Jul 14, 2014 at 5:26 PM, Prabhakar Lad
<prabhakar.csengg@gmail.com> wrote:
> Hi Lucas,
>
> On Mon, Jul 14, 2014 at 9:07 PM, Lucas Tanure <tanure@linux.com> 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.
>>
> Form the above message looks like you have done some modifications to your
> branch which is conflicting with the git pull.
>> So, How I can keep my local tree updated ? No matter what.
>>
> so you have to create a patch of your modifications reset the HEAD and then
> do a git pull and then later apply your patch.
>
> Thanks,
> --Prabhakar Lad

Problems with Linux next tree

[Benedict Börger]

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

Problems with Linux next tree

[Lucas Tanure]

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@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

Problems with Linux next tree

[Peter Senna Tschudin]

Lucas,

What do you get if you do:

$ git remote update

On Mon, Jul 14, 2014 at 11:04 PM, Lucas Tanure <tanure@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@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

Problems with Linux next tree

[Lucas Tanure]

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@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@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@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

Problems with Linux next tree

[Valdis.Kletnieks at vt.edu]

On Mon, 14 Jul 2014 17:57:10 -0300, Lucas Tanure said:
> Hi,
>
> No I didn't. It is a clean linux-next tree.
> Turns out that if I don't update every day I got this issue.

Due to the way the linux-next tree is built, 'git pull' won't work.

You want to 'git clone' Linus's master tree, then 'git remote add'
the Linux-next tree.  Then use 'git remote update' instead of 'git pull'
when you want to refresh the tree.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 848 bytes
Desc: not available
Url : http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20140714/3435ca99/attachment.bin 

Problems with Linux next tree

[黄钦佳]

> Due to the way the linux-next tree is built, 'git pull' won't work.
>
> You want to 'git clone' Linus's master tree, then 'git remote add'
> the Linux-next tree.  Then use 'git remote update' instead of 'git pull'
> when you want to refresh the tree.

I use 'git remote update', and then try 'git checkout master', it
tells that my branch has diverged.
But I do not have modifies on that branch. So I have to try 'git reset
20140707', and then checkout successed. I don't know why, any help?

Problems with Linux next tree

[Stone Kang]

On Tue, Jul 15, 2014 at 12:52:07PM +0800, ??? wrote:
> > Due to the way the linux-next tree is built, 'git pull' won't work.
> >
> > You want to 'git clone' Linus's master tree, then 'git remote add'
> > the Linux-next tree.  Then use 'git remote update' instead of 'git pull'
> > when you want to refresh the tree.
> 
> I use 'git remote update', and then try 'git checkout master', it
> tells that my branch has diverged.
> But I do not have modifies on that branch. So I have to try 'git reset
> 20140707', and then checkout successed. I don't know why, any help?
> 

There might have been an upstream rebase since your last pull (or
clone). Check out `git help rebase` for more about this.

After running `git reset 20140707`, HEAD points to a position after
rebase, so checkout is possible now.

Problems with Linux next tree

[Alexey Tulia]

Hi Lucas,

To follow changes to the linux-tree tree you need to first do a remote 
update (this will get all the changes from the remote linux-next branch 
to the local origin/master tracking branch) and then reset the HEAD 
pointer of current checked out branch to the HEAD of linux-next remote 
tracking branch (i.e origin/master).

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

This will make your current branch (master) *exactly* like the remote 
linux-next tree. You cannot do pull or merge from the remote tracking 
branch.

--
Alexey Tulia


On 07/14/2014 11:07 PM, 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
>
> --
> Lucas Tanure
> +55 (19) 988176559
>
> _______________________________________________
> Kernelnewbies mailing list
> Kernelnewbies at kernelnewbies.org
> http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
>

Problems with Linux next tree

[Prabhakar Lad]

Hi Lucas,

On Mon, Jul 14, 2014 at 9:57 PM, Lucas Tanure <tanure@linux.com> wrote:
> Hi,
>
> No I didn't. It is a clean linux-next tree.
> Turns out that if I don't update every day I got this issue.
>
> So, no solution yet.
>
If it is a clean then just try
$ git clean -fxd
$ git pull

Thanks,
--Prabhakar Lad

Problems with Linux next tree

[Prabhakar Lad]

Hi,

On Tue, Jul 15, 2014 at 5:52 AM, ??? <kinkabrain@gmail.com> wrote:
>> Due to the way the linux-next tree is built, 'git pull' won't work.
>>
>> You want to 'git clone' Linus's master tree, then 'git remote add'
>> the Linux-next tree.  Then use 'git remote update' instead of 'git pull'
>> when you want to refresh the tree.
>
> I use 'git remote update', and then try 'git checkout master', it
> tells that my branch has diverged.
> But I do not have modifies on that branch. So I have to try 'git reset
> 20140707', and then checkout successed. I don't know why, any help?

You should always create your own local branch and never work on master
branch!

Thanks,
--Prabhakar Lad

Problems with Linux next tree

[Varka Bhadram]

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.

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@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 

Problems with Linux next tree

[Kinka Huang]

ok, got it. Thanks!
2014-7-15 ??3:48? "Prabhakar Lad" <prabhakar.csengg@gmail.com>???

> Hi,
>
> On Tue, Jul 15, 2014 at 5:52 AM, ??? <kinkabrain@gmail.com> wrote:
> >> Due to the way the linux-next tree is built, 'git pull' won't work.
> >>
> >> You want to 'git clone' Linus's master tree, then 'git remote add'
> >> the Linux-next tree.  Then use 'git remote update' instead of 'git pull'
> >> when you want to refresh the tree.
> >
> > I use 'git remote update', and then try 'git checkout master', it
> > tells that my branch has diverged.
> > But I do not have modifies on that branch. So I have to try 'git reset
> > 20140707', and then checkout successed. I don't know why, any help?
>
> You should always create your own local branch and never work on master
> branch!
>
> Thanks,
> --Prabhakar Lad
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20140715/6b1571c2/attachment.html