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

Re: [Q] merge squash unexpected conflicts

From
Junio C Hamano <gitster@pobox.com>
Date
May 14, 2009, 03:21 UTC
Message-ID
<7v4ovo1iap.fsf@alter.siamese.dyndns.org>
In-Reply-To
<bb9d69200905131942t7a43a29fh9638d2548e9f12dc@mail.gmail.com>
Cory Sharp <cory.sharp@gmail.com> writes:
> Am I doing something a little wrong or unexpected?  Is there a way
> around this squash conflict behavior?  This doesn't seem to happen
> with plain merge without squash.
Of course.  That's the whole point of recording a merge as a merge.
Previous: Cory SharpNext: Cory Sharp
Message 2 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.