Re: Branches are Scary

[Eli Zaretskii]

> From: address@hidden (Phillip Lord)
> Date: Thu, 17 Dec 2015 22:20:06 +0000
> Cc: address@hidden
> 
> >> At the same time, if I am understanding things correctly, I can't squash
> >> and force feature and fix branches that I have pushed up, which means
> >> that these have to get deleted unmerged cause I squash and merge locally.
> >
> > It seems that *this* is the actual problem to solve.  The rule of thumb
> > is simple: Do not squash or rebase any commits you have pushed out, it
> > makes life hard for everybody else, that's why it's not allowed in the
> > repository.  If you still plan substantial cleanup of your commits, just
> > do not push them yet.
> 
> Makes it hard to get comments on them, I think.

How's that?  Can you tell more details how getting comments requires
squashing?

> Possibly, the solution is not to use the main emacs git for this
> form of collaboration, but to publish my own repo

That'd be less convenient, so I think we should avoid that as much as
possible.

> Clearly rebasing on a branch with many people are working on would be
> bad.

Why not merge instead?  That's what I do, and I have yet to see a
single problem.  What am I missing?