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

how to do "git merge --abort"

From
BLbill lam <cbill.lam@gmail.com>
Date
Aug 21, 2009, 14:51 UTC
Message-ID
<20090821145157.GA6471@debian.b2j>

How to abort a merge if it said there are conflicts but I do not want to (or can not) resolve it for the moment. I can not find the --abort option as that for git-rebase.

-- 
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
Next: Jeff King
Message 1 of 5 in “how to do "git merge --abort"”
  1. bill lamAug 21, 2009
  2. Jeff KingAug 21, 2009
  3. Thomas RastAug 21, 2009
  4. Jeff KingAug 21, 2009
  5. bill lamAug 22, 2009

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.