July 15, 2014
1:16 p.m.
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.