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, 18:25 UTC
Message-ID
<bb9d69200905141125i4a8ffaa8j6aea2a6c44de0c7d@mail.gmail.com>
In-Reply-To
<20090514070129.GL8212@noris.de>
On Thu, May 14, 2009 at 12:01 AM, Michael Radziej <mir@noris.de> wrote:
> git merge --squash is not a merge at all. ...
> It is useful only in very special circumstances.

You're right. I (incorrectly) thought I had to use --squash to properly interface with an svn branch and trunk through git-svn. I thought not using squash would trigger hundreds of commits - it doesn't, nice things happen with just "merge".

Thanks everyone for helping me, Cory

Previous: Michael RadziejNext: Michael J Gruber
Message 9 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.