[1606] in athena10
Re: Debathena website and "beta" website
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Fri Mar 13 13:17:13 2009
Date: Fri, 13 Mar 2009 13:16:08 -0400 (EDT)
From: Anders Kaseorg <andersk@MIT.EDU>
To: Greg Price <price@mit.edu>
cc: debathena@mit.edu
In-Reply-To: <20090313064907.GY25963@mit.edu>
Message-ID: <alpine.DEB.2.00.0903131306200.15595@vinegar-pot.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=UTF-8
Content-Transfer-Encoding: 8bit
On Fri, 13 Mar 2009, Greg Price wrote:
> - bring the root site up to date with the /beta site,
> probably with git rebase and then git push
Ew, no! You are too used to the git-svn development model that forces you
to squash your history into a linear chain. In general, rebasing should
only be used to clean up non-published local branches that make one
logical set of changes, and even then, only if the exact versions of the
mainline that it descended from are irrelevant.
I’ve been syncing the main and beta websites with merges, not rebases,
becase they are both published branches that have changed over time. A
rebase at this point, even if it worked at all, would destroy all that
history.
Anders
