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

Re: [Q] merge squash unexpected conflicts

From
CSCory Sharp <cory.sharp@gmail.com>
Date
May 14, 2009, 06:34 UTC
Message-ID
<bb9d69200905132334m7a4e3a4akde3529abeab5a09@mail.gmail.com>
In-Reply-To
<7veiusz45w.fsf@alter.siamese.dyndns.org>
On Wed, May 13, 2009 at 9:42 PM, Junio C Hamano <gitster@pobox.com> wrote:
> What's your point?
I am asking for help and understanding.
Show 6 quoted lines
> WIth --squash, the tree and the index state becomes the same as if a real
> merge happened.  But the merge history is discarded with --squash.  It is
> a simulation of a merge in CVS and SVN (before they added "merge tracking").
>
> If you want support for repeated merges by merge tracking, you do not want
> todiscard the merge history by using --squash.

Why doesn't --squash do merge tracking? The help didn't indicate that it doesn't, and I don't understand why it shouldn't -- since I *could* track the previous merge point manually and do "git diff --binary PREV_MERGE..NEXT_MERGE | git apply -" to do the merge myself.

But since that's me manually performing merge tracking, why doesn't "merge --squash" track like just "merge" does? If I didn't want tracking, I would expect to use some other command than "git merge [options]".

Thanks for your help, Cory

Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 11 in “Re: [Q] merge squash unexpected conflicts”
  1. Cory SharpMay 14, 2009
  2. Junio C HamanoMay 14, 2009
  3. Cory SharpMay 14, 2009
  4. Junio C HamanoMay 14, 2009
  5. Cory SharpMay 14, 2009
  6. Junio C HamanoMay 14, 2009
  7. Cory SharpMay 14, 2009
  8. Michael RadziejMay 14, 2009
  9. Cory SharpMay 14, 2009
  10. Michael J GruberMay 14, 2009
  11. Cory SharpMay 14, 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.