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

Do I misunderstand cg-merge --squash option

From
Alan Chandler <alan@chandlerfamily.org.uk>
Date
Nov 10, 2005, 00:25 UTC
Message-ID
<200511100025.05993.alan@chandlerfamily.org.uk>

I am trying to take my current development repository which has several hundred commits in it as I was developing my application and make a simplified branch for pushing to my public repository.

I basically created a new branch (public) from the tag at the point where I started the repository.

git-checkout -b public initial_commit
I then did a merge
cg-merge --squash v1.0

This seemed to work fine (although it had trouble prompting me with an open editor to edit the commit message)

But I don't know how to move forward and merge in changes after my v1.0 tag. Any attempt to merge anything else into this "public" branch seems to throw up what appears to be merge conflict, but I can't see why - when I look at the results one side has extra lines, but there is no other overlap.

-- 
Alan Chandler
http://www.chandlerfamily.org.uk
Open Source. It's the difference between trust and antitrust.
Next: Petr Baudis
Message 1 of 6 in “Do I misunderstand cg-merge --squash option”
  1. Alan ChandlerNov 10, 2005
  2. Petr BaudisNov 10, 2005
  3. Alan ChandlerNov 10, 2005
  4. Petr BaudisNov 10, 2005
  5. Alan ChandlerNov 10, 2005
  6. Petr BaudisNov 10, 2005

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.