Pushing a merge

Andreas Wolf typo3ml at andreaswolf.info
Tue Aug 2 19:40:59 CEST 2011


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

Hi,

I just merged my local FAL changes into the project-fileabstraction
branch. Unfortunately, Gerrit won't let me push this:

> aw at aw-tp.ka.wolf:/home/www/localhost/typo3-fal/typo3_src [106]$ git
> push incubator HEAD:refs/heads/project-fileabstraction Counting
> objects: 635, done. Delta compression using up to 4 threads. 
> Compressing objects: 100% (613/613), done. Writing objects: 100%
> (617/617), 89.46 KiB, done. Total 617 (delta 455), reused 0 (delta
> 0) remote: Resolving deltas:  55% (251/455) To
> ssh://andreaswolf@review.typo3.org:29418/TYPO3v4/Incubator.git !
> [remote rejected] HEAD -> project-fileabstraction (you are not
> allowed to upload merges) error: failed to push some refs to
> 'ssh://andreaswolf@review.typo3.org:29418/TYPO3v4/Incubator.git'


Rebasing unfortunately also isn't an option here, as we are speaking of
more than 70 commits from 10 months where a lot of conflicts might occur
- - and I'm not really fond of fixing all this stuff manually then...

Is there any way to tell Gerrit to let me push a merge - perhaps a
review request? Or any other way to push to this repository?

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

iEYEAREIAAYFAk44NqsACgkQHWtXp155bP9zMACfRDAw52wIBQk0vn7QjDXbIhQd
M6EAn0ntK5RKfSkopbUfve4R9bAt83aS
=3Uu3
-----END PGP SIGNATURE-----


More information about the TYPO3-project-ble mailing list