kernelnewbies.kernelnewbies.org archive mirror
 help / color / mirror / Atom feed
From: benedict.boerger@gmail.com (Benedict Börger)
To: kernelnewbies@lists.kernelnewbies.org
Subject: Problems with Linux next tree
Date: Mon, 14 Jul 2014 22:57:25 +0200	[thread overview]
Message-ID: <53C44435.5010709@gmail.com> (raw)
In-Reply-To: <CAJyon0tXGdhe-Q7b37LPjHw_gPqsD75bKZ6g5XztumCvGUhKyQ@mail.gmail.com>

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

  parent reply	other threads:[~2014-07-14 20:57 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-14 20:07 Problems with Linux next tree Lucas Tanure
2014-07-14 20:26 ` Prabhakar Lad
2014-07-14 20:57   ` Lucas Tanure
2014-07-14 21:54     ` Valdis.Kletnieks at vt.edu
2014-07-15  7:45     ` Prabhakar Lad
2014-07-14 20:57 ` Benedict Börger [this message]
2014-07-14 21:04   ` Lucas Tanure
2014-07-14 21:18     ` Peter Senna Tschudin
2014-07-14 21:29       ` Lucas Tanure
2014-07-15  6:46 ` Alexey Tulia
  -- strict thread matches above, loose matches on Subject: below --
2014-07-15  4:52 黄钦佳
2014-07-15  5:37 ` Stone Kang
2014-07-15  7:47 ` Prabhakar Lad
2014-07-15 14:52   ` Kinka Huang
2014-07-14 19:58 Lucas Tanure
2014-07-15 13:16 ` Varka Bhadram
2014-07-15 13:32   ` Lucas Tanure

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53C44435.5010709@gmail.com \
    --to=benedict.boerger@gmail.com \
    --cc=kernelnewbies@lists.kernelnewbies.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).