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

From: Petr Baudis <pasky@suse.cz>
Date: Nov 10, 2005, 19:29 UTC
Message-ID: <20051110192923.GT30496@pasky.or.cz>
In-Reply-To: <200511101915.53736.alan@chandlerfamily.org.uk>

Dear diary, on Thu, Nov 10, 2005 at 08:15:53PM CET, I got a letter where Alan Chandler <alan@chandlerfamily.org.uk> said that...

Show 12 quoted lines

> On Thursday 10 Nov 2005 10:12, Petr Baudis wrote:
> > Why do you want to do a squash merge?
> 
> I used git experimentally as I built a web application from scratch, learning 
> both what I wanted the application to look like and how to do it with the 
> packages I was using.  There is several hundreds of commits that are totally 
> irrelevant (both because they were all different directions I was trying and 
> then backing out of and because I saved state just were I was when I gave up 
> for the day).
> 
> So what I was experimenting with was whether I could somehow get rid of that 
> history (at least in one branch) before making that history public.

Aha. That sounds reasonable.

Show 7 quoted lines

> > 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.
> 
> I know - I saw the warning - and I was only experimenting.  I just didn't 
> understand what had happened.

If you would be doing something like this again, it's best to merge, and then rather than continuing to develop what you merged, just throw that branch again and re-clone the merged repository.

Right now, what about trying to manually select the merge base?

	public$ cg-merge -b v1.0 master

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