git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: TOPGIT: [PATCH] tg create: add --force option to resolve merge dependencies.

From
Bert Wesarg <bert.wesarg@googlemail.com>
Date
Aug 12, 2008, 17:55 UTC
Message-ID
<36ca99e90808121055v5efcc1do68731b905a359a68@mail.gmail.com>
In-Reply-To
<1218553338.7264.14.camel@heerbeest>
On Tue, Aug 12, 2008 at 17:02, Jan Nieuwenhuizen <janneke-list@xs4all.nl> wrote:
Show 6 quoted lines
> 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.
Previous: Jan Nieuwenhuizen
Message 4 of 4 in “TOPGIT: [PATCH] tg create: add --force option to resolve merge dependencies.”
  1. Jan NieuwenhuizenAug 12, 2008
  2. Petr BaudisAug 12, 2008
  3. Jan NieuwenhuizenAug 12, 2008
  4. Bert WesargAug 12, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.