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