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

Re: bogus merges

From
Petr Baudis <pasky@suse.cz>
Date
Sep 12, 2005, 00:58 UTC
Message-ID
<20050912005807.GI15630@pasky.or.cz>
In-Reply-To
<Pine.LNX.4.63.0509111256300.23242@iabervon.org>

Dear diary, on Sun, Sep 11, 2005 at 08:08:14PM CEST, I got a letter where Daniel Barkalow <barkalow@iabervon.org> told me that...

> I think that the fundamental bug is that tree_timewrap() doesn't clear 
> .git/merging, which means that it can still think you're doing a merge 
> when you've started doing something else (such as doing further 
> development after updating to someone else's merge of your tree).
Oh, nice catch. Thanks, fixed.
-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone.  -- Alan Cox
Previous: Daniel BarkalowNext: Russell King
Message 8 of 13 in “bogus merges”
  1. Wayne ScottSep 5, 2005
  2. Linus TorvaldsSep 5, 2005
  3. Wayne ScottSep 6, 2005
  4. Russell KingSep 11, 2005
  5. Daniel BarkalowSep 6, 2005
  6. Russell KingSep 11, 2005
  7. Daniel BarkalowSep 11, 2005
  8. Petr BaudisSep 12, 2005
  9. Russell KingSep 11, 2005
  10. Martin LanghoffSep 11, 2005
  11. A Large Angry SCMSep 11, 2005
  12. Russell KingSep 11, 2005
  13. Russell KingSep 11, 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.