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

Re: having to pull twice

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Sep 25, 2008, 23:25 UTC
Message-ID
<20080925232525.GP23137@genesis.frugalware.org>
In-Reply-To
<200809250905.09646.trast@student.ethz.ch>
On Thu, Sep 25, 2008 at 09:05:02AM +0200, Thomas Rast <trast@student.ethz.ch> wrote:
> On the other hand, as near as I can tell this is a regression in
> builtin-merge.  Miklos, do you know if/how this can be fixed?

I think Junio already fixed this in 446247d (merge: fix numerus bugs around "trivial merge" area, 2008-08-23), so 1.6.0.1 or 1.6.0.2 should not have this bug.

Michael, could you please upgrade frm 1.6.0 and confirm your problem goes away?

Thanks.
Previous: Michael P. SoulierNext: Thomas Rast
Message 6 of 11 in “having to pull twice”
  1. Michael P. SoulierSep 25, 2008
  2. Shawn O. PearceSep 25, 2008
  3. Thomas RastSep 25, 2008
  4. Alex RiesenSep 25, 2008
  5. Michael P. SoulierSep 25, 2008
  6. Miklos VajnaSep 25, 2008
  7. Thomas RastSep 27, 2008
  8. Miklos VajnaSep 28, 2008
  9. Thomas RastSep 28, 2008
  10. Miklos VajnaSep 29, 2008
  11. builtin-merge: refresh the index before calling a strategyMiklos Vajna, Oct 3, 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.