[Development] The containers in the "containers" branch
oswald.buddenhagen at nokia.com
Wed Aug 1 09:48:53 CEST 2012
On Wed, Aug 01, 2012 at 09:32:53AM +1000, Rohan McGovern wrote:
> Oswald Buddenhagen said:
> > that's slight overkill. when you direct-push to a branch
> > with no activity,
> > you can just direct-push the staging branch as well - you just
> > edit the command line, replacing heads with staging.
> Doing the staging-rebuild command would correctly take into account any
> changes which are currently staged (if any). If you do a force push to
> the staging branch, changes could be left in 'staged' state in the
> database but not actually be present in the staging branch.
as force-pushing into a branch which has activity (from more than one
person) is generally a no-go, this is a bit of a corner case.
fwiw, i did no forced push - it was a fast-forward. the same would have
worked for the staging branch, for the same reasons.
but anyway, just sayin'.
More information about the Development