From: "Bert Wesarg" <bert.wesarg@googlemail.com>
To: "Jan Nieuwenhuizen" <janneke-list@xs4all.nl>
Cc: "Petr Baudis" <pasky@suse.cz>, git@vger.kernel.org
Subject: Re: TOPGIT: [PATCH] tg create: add --force option to resolve merge dependencies.
Date: Tue, 12 Aug 2008 19:55:16 +0200 [thread overview]
Message-ID: <36ca99e90808121055v5efcc1do68731b905a359a68@mail.gmail.com> (raw)
In-Reply-To: <1218553338.7264.14.camel@heerbeest>
On Tue, Aug 12, 2008 at 17:02, Jan Nieuwenhuizen <janneke-list@xs4all.nl> wrote:
> 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.
Could be, there was a fix for this from me. If you have a
.git/info/gitattributes file, you where hit by the bug. But with 0.2
this is gone.
Bert
>
> Thanks.
prev parent reply other threads:[~2008-08-12 17:56 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
2008-08-12 17:55 ` Bert Wesarg [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=36ca99e90808121055v5efcc1do68731b905a359a68@mail.gmail.com \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=janneke-list@xs4all.nl \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).