Re: Do I misunderstand cg-merge --squash option

From: Petr Baudis <pasky@suse.cz>
Date: Nov 10, 2005, 10:12 UTC
Message-ID: <20051110101206.GP30496@pasky.or.cz>
In-Reply-To: <200511100025.05993.alan@chandlerfamily.org.uk>

Dear diary, on Thu, Nov 10, 2005 at 01:25:05AM CET, I got a letter where Alan Chandler <alan@chandlerfamily.org.uk> said that...

Show 12 quoted lines

> 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

Why do you want to do a squash merge?

> 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.

I told you in the documentation - "re-merging with that branch later will cause trouble". If you want to be able to re-merge the branch later, you shouldn't use squash merge. And you shouldn't use squash merge anyway, expect for few narrow use cases.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.