[U-Boot-Users] GIT merge

[Michal Simek]

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