[Development] The containers in the "containers" branch

[Rohan McGovern]

Thiago Macieira said:
> On quinta-feira, 26 de julho de 2012 13.27.16, Thiago Macieira wrote:
> > I'll abandon all changes still open in one week. They're cluttering my 
> > dashboard.
> 
> Uh... André has approved one commit and tried to stage it, but it failed. 
> Gerrit claims a conflict.
> 
> Should be easy to fix...
> 
> ... except that the commits are already rebased and there are no new commits 
> in that branch. Can someone check to see what we're doing wrong?
> 

The conflict is with the staging branch (refs/staging/containers).
That was 8141e34280a92088a527e0935765ad8ba8e92be8.

It looks to me like the 'containers' branch has been used inconsistently
with respect to CI, like somebody fast-forwarded it
from 8141e34280a92088a527e0935765ad8ba8e92be8 to
7a0b8d580df8d6b0012d11f61299046682f4d18a rather than putting a merge
commit through CI.  Apparently, doing that will not automatically cause
the staging branch to be updated.

For future reference, whoever is bypassing the CI to change the SHA1 of
a branch should also issue a command like this to update the staging
branch:

  ssh -p 29418 codereview.qt-project.org gerrit staging-rebuild --project qt/qtbase --branch containers

, which I have now done, fixing the conflict.