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:54 UTC
Message-ID
<bb9d69200905132354h6b64171g24351840fb1d0893@mail.gmail.com>
In-Reply-To
<7v4ovoxk0n.fsf@alter.siamese.dyndns.org>
On Wed, May 13, 2009 at 11:42 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Because "merge" is (no surprise) what tracks what (two or more) things
> were merged.  And with --squash you are choosing not to make a merge.  I
> am not sure if there is any more thing to be explained...
Yeah I'm not quite getting it.  Thanks for trying to explain, though.
Previous: Junio C HamanoNext: Michael Radziej
Message 7 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.