From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Mon, 14 Feb 2011 11:07:00 +0100 Subject: [U-Boot] merge conflicts during git pull In-Reply-To: <4D58F04F.3080001@matrix-vision.de> References: <4D555611.2040907@matrix-vision.de> <20110211191355.D0475135593@gemini.denx.de> <4D58F04F.3080001@matrix-vision.de> Message-ID: <4D58FEC4.3040600@free.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 a new repo an pull in my local branches. Just a side note: I tend to prefer git fetch over git pull, because I am sure that I don't affect my working branch unless I really want to, at which point I do it voluntarily and in a controlled manner, through git rebase or git merge, and even then, I often tag my branch beforehand so that I cen easily double-check the actions and revert them as/if needed. Amicalement, -- Albert.