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

Re: Strange merge conflicts against earlier merge.

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Nov 11, 2005, 04:40 UTC
Message-ID
<46a038f90511102040n3e251252rce54117c51ce0429@mail.gmail.com>
In-Reply-To
<20051110102043.GQ30496@pasky.or.cz>
On 11/10/05, Petr Baudis <pasky@suse.cz> wrote:
Show 5 quoted lines
> Interesting. Could you check what the merge base is?
>
>         git-merge-base local remote
>
> It should be the merge from (1).
It seems to be actually one of the parents, not the merge itself.
Show 7 quoted lines
> > For an example, clone
> > http://locke.catalyst.net.nz/git/moodle.git#mdl-artena-tairawhiti and
> > register also the
> > http://locke.catalyst.net.nz/git/moodle.git#mdl-local branch. Create
> > two heads:
>
> Could you please run git-update-server-info over there?
Should be fixed now...
cheers,
martin
Previous: Petr BaudisNext: Petr Baudis
Message 3 of 13 in “Strange merge conflicts against earlier merge.”
  1. Martin LanghoffNov 10, 2005
  2. Petr BaudisNov 10, 2005
  3. Martin LanghoffNov 11, 2005
  4. Petr BaudisNov 11, 2005
  5. Fredrik KuivinenNov 11, 2005
  6. Petr BaudisNov 11, 2005
  7. Petr BaudisNov 11, 2005
  8. Junio C HamanoNov 11, 2005
  9. Petr BaudisNov 11, 2005
  10. Petr BaudisNov 11, 2005
  11. Junio C HamanoNov 11, 2005
  12. Daniel BarkalowNov 11, 2005
  13. Junio C HamanoNov 12, 2005

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.