From mboxrd@z Thu Jan  1 00:00:00 1970
From: varkabhadram@gmail.com (Varka Bhadram)
Date: Tue, 15 Jul 2014 18:46:05 +0530
Subject: Problems with Linux next tree
In-Reply-To: <CAJyon0uLyTEvKJ1FaNNPJ4eFcS4gDad1pxXiFEe7H7eNoErKgg@mail.gmail.com>
References: <CAJyon0uLyTEvKJ1FaNNPJ4eFcS4gDad1pxXiFEe7H7eNoErKgg@mail.gmail.com>
Message-ID: <53C52995.4060805@gmail.com>
To: kernelnewbies@lists.kernelnewbies.org
List-Id: kernelnewbies.lists.kernelnewbies.org

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.