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

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

From
OGOlivier Galibert <galibert@pobox.com>
Date
Sep 22, 2005, 00:54 UTC
Message-ID
<20050922005455.GA93041@dspnet.fr.eu.org>
In-Reply-To
<20050921.172849.103555057.davem@davemloft.net>
On Wed, Sep 21, 2005 at 05:28:49PM -0700, David S. Miller wrote:
> You know, I personally was unaware that this was supported until now.
> I have been always reverting local debugging changes in order to merge
> other people's work in, then reapply the debugging changes afterwards.

Why don't you commit the debugging changes, go back one step in the tree (reverting them through git in practice), merge other's people work then merge the debugging changes back in ? You never know when the debug changes will be useful again, so it's nice to have them in your private tree, and this method makes it reasonably automatic.

  OG.
Previous: Linus TorvaldsNext: Martin Langhoff
Message 7 of 10 in “Please undo "Use git-merge instead of git-resolve in git-pull"”
  1. Linus TorvaldsSep 21, 2005
  2. Linus TorvaldsSep 21, 2005
  3. Junio C HamanoSep 21, 2005
  4. Linus TorvaldsSep 21, 2005
  5. David S. MillerSep 22, 2005
  6. Linus TorvaldsSep 22, 2005
  7. Olivier GalibertSep 22, 2005
  8. Martin LanghoffSep 22, 2005
  9. Linus TorvaldsSep 22, 2005
  10. Petr BaudisSep 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.