From: Jan Nieuwenhuizen <janneke-list@xs4all.nl>
To: Petr Baudis <pasky@suse.cz>
Cc: git@vger.kernel.org
Subject: Re: TOPGIT: [PATCH] tg create: add --force option to resolve merge dependencies.
Date: Tue, 12 Aug 2008 17:02:18 +0200 [thread overview]
Message-ID: <1218553338.7264.14.camel@heerbeest> (raw)
In-Reply-To: <20080812133857.GL32184@machine.or.cz>
On di, 2008-08-12 at 15:38 +0200, Petr Baudis wrote:
> how exactly did you get the morge conflicts?
I'm not sure, cannot seem to reproduce them anymore. May
have been pre-0.2 issue or another goof-up over here.
Thanks.
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien | http://www.lilypond.org
next prev parent reply other threads:[~2008-08-12 15:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-12 13:01 TOPGIT: [PATCH] tg create: add --force option to resolve merge dependencies Jan Nieuwenhuizen
2008-08-12 13:38 ` Petr Baudis
2008-08-12 15:02 ` Jan Nieuwenhuizen [this message]
2008-08-12 17:55 ` Bert Wesarg
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=1218553338.7264.14.camel@heerbeest \
--to=janneke-list@xs4all.nl \
--cc=git@vger.kernel.org \
--cc=pasky@suse.cz \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.