From: Reinhard Meyer Date: Mon, 06 Dec 2010 06:56:50 +0100 Subject: [U-Boot] [PATCH v2 0/4] get at91rm9200ek working with ARM relocation In-Reply-To: <20101206053747.67954659@gemini.denx.de> References: <1291146306-15103-1-git-send-email-andreas.devel@googlemail.com> <4CFB6107.9060000@emk-elektronik.de> <4CFBD250.1050502@aribaud.net> <90F3B181-8AA6-438C-855C-A78824261760@googlemail.com> <4CFBE49B.303@emk-elektronik.de> <20101205210449.EDB66D08AB4@gemini.denx.de> <4CFC031F.9020300@emk-elektronik.de> <20101205214204.CF89FD08AB4@gemini.denx.de> <4CFC0966.4010303@emk-elektronik.de> <20101206053747.67954659@gemini.denx.de> Message-ID: <4CFC7B22.7000605@emk-elektronik.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Wolfgang Denk, > In message<4CFC0966.4010303@emk-elektronik.de> you wrote: >> >> What's possible in git-rebase should be possible in git-am, too. > > git-rebase will also show merge conflicts in such cases. I'm not not what you are trying to say here, since I stated that I wished git-am would behave the same way as git-rebase. Anyway, I solved the problem: git-am -3 when this fails, do git-am -3 --skip edit the unmerged files add them git-am -3 --resolved and all is fine. Best Regards, Reinhard