From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michal Simek <monstr@seznam.cz>
Date: Tue, 8 May 2007 00:05:49 +0200
Subject: [U-Boot-Users] GIT merge
References: <002401c79096$fbb9a410$0200a8c0@monstrone>
	<1defaf580705070516o5770da97u35c91aac6212424a@mail.gmail.com>
	<463F2842.2010008@smiths-aerospace.com>
Message-ID: <002e01c790f3$df19c850$0200a8c0@monstrone>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

I solved my problem.
git-instaweb don't shown merge but gitk yes.

Commands:
git pull git://www.denx.de/git/u-boot.git
git stat
resolve merge conficts
git add conflict_files
+
git push to custodian repository.
a then web checking

thanks Havard

Best regards
Michal Simek