Re: git pull failed: CONFLICT

2012-01-19 Thread Uwe Kleine-König
Hello Antony, On Wed, Jan 18, 2012 at 11:02:06PM +0400, Antony Pavlov wrote: As usual as usual I tried to pull next branch from git://git.pengutronix.de/git/barebox, but got error message. $ git checkout next$ git pullremote: Counting objects: 287, done.remote: Compressing objects: 100%

git pull failed: CONFLICT

2012-01-18 Thread Antony Pavlov
Hi! As usual as usual I tried to pull next branch from git://git.pengutronix.de/git/barebox, but got error message. $ git checkout next$ git pullremote: Counting objects: 287, done.remote: Compressing objects: 100% (121/121), done.remote: Total 193 (delta 164), reused 85 (delta 67)Receiving