Problems with Linux next tree
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
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
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
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.
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
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
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
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@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
-- Peter
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@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
-- Peter
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@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
participants (6)
-
Alexey Tulia -
Benedict Börger -
Lucas Tanure -
Peter Senna Tschudin -
Prabhakar Lad -
Valdis.Kletnieks＠vt.edu