All of lore.kernel.org
 help / color / mirror / Atom feed
From: varkabhadram@gmail.com (Varka Bhadram)
To: kernelnewbies@lists.kernelnewbies.org
Subject: Problems with Linux next tree
Date: Tue, 15 Jul 2014 18:46:05 +0530	[thread overview]
Message-ID: <53C52995.4060805@gmail.com> (raw)
In-Reply-To: <CAJyon0uLyTEvKJ1FaNNPJ4eFcS4gDad1pxXiFEe7H7eNoErKgg@mail.gmail.com>

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.

  reply	other threads:[~2014-07-15 13:16 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-14 19:58 Problems with Linux next tree Lucas Tanure
2014-07-15 13:16 ` Varka Bhadram [this message]
2014-07-15 13:32   ` Lucas Tanure
  -- strict thread matches above, loose matches on Subject: below --
2014-07-14 20:07 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
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
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

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=53C52995.4060805@gmail.com \
    --to=varkabhadram@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.