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

Re: Please undo "Use git-merge instead of git-resolve in

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Sep 22, 2005, 21:57 UTC
Message-ID
<Pine.LNX.4.63.0509221747340.23242@iabervon.org>
In-Reply-To
<Pine.LNX.4.58.0509221427520.2553@g5.osdl.org>
On Thu, 22 Sep 2005, Linus Torvalds wrote:
> Basically: having dirty state in your tree and then ending up having to do 
> a manual merge is a big pain. Not worth it. I just keep really small dirty 
> stuff so that I don't mind blowing it away if I need to.

Would it be worthwhile to have a flag to make git-read-tree abort rather than making a mess if you have any dirty state and the merge isn't completely automatic? It's certainly easy enough to write.

	-Daniel
*This .sig left intentionally blank*
Previous: Linus TorvaldsNext: Linus Torvalds
Message 4 of 7 in “Re: Please undo "Use git-merge instead of git-resolve in”
  1. Jon LoeligerSep 22, 2005
  2. Linus TorvaldsSep 22, 2005
  3. Linus TorvaldsSep 22, 2005
  4. Daniel BarkalowSep 22, 2005
  5. Linus TorvaldsSep 22, 2005
  6. Fix overzealous cleanliness check in git-mergeJunio C Hamano, Sep 23, 2005
  7. Use git-merge in git-pull (second try).Junio C Hamano, Sep 23, 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.