[TYPO3-BLE] Pushing a merge

[Andreas Wolf]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hi,

Am 03.08.2011 12:03, schrieb Oliver Hader:
> Yepp, Peter is currently not available and I'm not sure whether he
> will read his mails. Concerning the problem, merge commits are not
> allowed with Gerrit in general (only some admin users can do these
> commits).

isn't there a "+ 3" setting allowing to push merges? I think it would be
good to have that enabled for the incubator - at least for the people
responsible for the projects, as we will possibly have quite some merges
from other sources here.


> 1) An admin (e.g. Sebastian) is going to do the merge commit

I'm also fine with that, I would push my tree to Github then.


> 2) Your are going to cherry-pick the changes and push them to 
> Incubator.git, e.g. by doing the following

I know about cherry-picking or rebasing, but that's what I wanted to
avoid in the first place - because it will lead to a complete mess with
several conflicts that have to be fixed manually. A merge only creates
one commit where the conflicts can be resolved at once (and it was just
one real conflict there, the rest was concerning submodules).

Cheers
Andreas
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEAREIAAYFAk45I2EACgkQHWtXp155bP9EQgCdGKlLHQ/lsDX45rY1hjSzvEFT
yHUAoIbMpf9L0MHghdCa5uhuCera+DVH
=DcbN
-----END PGP SIGNATURE-----