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

Re: [PATCH] refuse to merge during a merge

From
John Tapsell <johnflux@gmail.com>
Date
May 28, 2009, 16:12 UTC
Message-ID
<43d8ce650905280912q71c749bn7146210a5838a453@mail.gmail.com>
In-Reply-To
<20090527210410.GA14742@localhost>
> +       if (read_cache_unmerged() || file_exists(git_path("MERGE_HEAD")))
>                die("You are in the middle of a conflicted merge.");

Could the error message also give possible solutions? "Commit the current merge first with 'git commit', or discard the current merge attempt with 'git reset --hard'" or something. Or at least a pointer to where to read for more info.

John
Previous: Constantine PlotnikovNext: Clemens Buchacher
Message 3 of 11 in “refuse to merge during a merge”
  1. refuse to merge during a mergeClemens Buchacher, May 27, 2009
  2. Constantine PlotnikovMay 28, 2009
  3. John TapsellMay 28, 2009
  4. Clemens BuchacherMay 30, 2009
  5. Jakub NarebskiMay 30, 2009
  6. Thomas RastMay 30, 2009
  7. refuse to merge during a mergeClemens Buchacher, May 31, 2009
  8. John TapsellMay 31, 2009
  9. Clemens BuchacherMay 31, 2009
  10. Junio C HamanoMay 31, 2009
  11. refuse to merge during a mergeClemens Buchacher, Jun 1, 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.