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

Re: force "unmerged" for same-file auto-merges

From
Dilip M <dilipm79@gmail.com>
Date
Mar 27, 2010, 17:22 UTC
Message-ID
<c94f8e121003271022v2b30ef52j3bd4015f12938f7a@mail.gmail.com>
In-Reply-To
<hoh16f$koe$1@dough.gmane.org>
On Fri, Mar 26, 2010 at 6:34 AM, Neal Kreitzinger <neal@rsss.com> wrote:
Show 7 quoted lines
> In other words, when two people modify the same file in different places I
> want the automerge results file, but I want the resulting file marked as
> unmerged so the programmer can then run git-mergetool to review the merge
> results.  This also prevents the programmer from running git-commit
> immediately after the automerge without reviewing the merge results.  Can
> "mark automerge of samefile as 'unmerged'" be done in git via config
> settings or command options?

What about merge with '--no-commit' option and than doing 'diff --cached'. You have option of still seeing what merged and decide to reset or commit.

-- 
Dilip
Previous: Neal KreitzingerNext: Junio C Hamano
Message 3 of 5 in “force "unmerged" for same-file auto-merges”
  1. Neal KreitzingerMar 24, 2010
  2. Neal KreitzingerMar 26, 2010
  3. Dilip MMar 27, 2010
  4. Junio C HamanoMar 26, 2010
  5. Sitaram ChamartyMar 27, 2010

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.