public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Michal Simek <monstr@seznam.cz>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] GIT merge
Date: Tue, 8 May 2007 00:05:49 +0200	[thread overview]
Message-ID: <002e01c790f3$df19c850$0200a8c0@monstrone> (raw)
In-Reply-To: 463F2842.2010008@smiths-aerospace.com

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

      reply	other threads:[~2007-05-07 22:05 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-07 11:00 [U-Boot-Users] GIT merge Michal Simek
2007-05-07 12:16 ` Håvard Skinnemoen
2007-05-07 12:51   ` Wolfgang Denk
2007-05-07 13:23   ` Jerry Van Baren
2007-05-07 22:05     ` Michal Simek [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='002e01c790f3$df19c850$0200a8c0@monstrone' \
    --to=monstr@seznam.cz \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox