[TYPO3-BLE] Pushing a merge

[Oliver Hader]

Hi Andreas,

Am 03.08.11 12:30, schrieb Andreas Wolf:
> 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).

I had a short discussion with Sebastian on that topic. One solution
could be to use a squash commit - but I guess you want to keep the
history and don't have all changes squashed in one single commit.

Besides that, Sebastian is going to have a look into the settings of
Gerrit concerning the "+3 merge commit" for Incubator.git. Please remind
him personally tomorrow if there was no feedback from his side. Thanks &
hope that helps!

Cheers,
Olly
-- 
Oliver Hader
TYPO3 v4 Core Team Leader

TYPO3 .... inspiring people to share!
Get involved: http://typo3.org