Re: [U-Boot] merge conflicts during git pull

2011-02-14 Thread Albert ARIBAUD
Le 14/02/2011 10:05, Andre Schwarz a écrit : > Wolfgang, > > > >>> Have I missed anything ? >>> Is there a way to get automagically merged whatever there might be to >>> merge ? >> Sorry, I have no idea what happenend of your system. I can see no >> issues on our side. > > thank - will clone

Re: [U-Boot] merge conflicts during git pull

2011-02-14 Thread Andre Schwarz
Wolfgang, >> Have I missed anything ? >> Is there a way to get automagically merged whatever there might be to >> merge ? > Sorry, I have no idea what happenend of your system. I can see no > issues on our side. thank - will clone a new repo an pull in my local branches. -- Regards, A

Re: [U-Boot] merge conflicts during git pull

2011-02-11 Thread Wolfgang Denk
Dear Andre, In message <4d555611.2040...@matrix-vision.de> you wrote: > > just wanted to update my local U-Boot master branch an got some errors I > don't understand (since I'm still a git newbie). ... > Currently the repo is clean, i.e. everything committed and I did a "git > co master" and "g

[U-Boot] merge conflicts during git pull

2011-02-11 Thread Andre Schwarz
Wolfgang, just wanted to update my local U-Boot master branch an got some errors I don't understand (since I'm still a git newbie). This is what I have: git originally cloned from public repo - thus I have in .git/config : [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/*