[TYPO3-dev] Git question: working around Gerrit exceptionally?

François Suter fsu-lists at cobweb.ch
Wed May 14 21:06:31 CEST 2014


Hi Christian,

> Can't you branch off current master to "devlog-3-experimental" or
> something, then revert all changes in master that where done, down to
> the common root of master and 2.x, then cherry-pick all changes you want
> from 2_9 branch? This should end up with a clean master without history
> rewriting. You may also squash those commits to one big change saying
> "resetting master to current 2.9 state" or similar, if you do not want
> to pollute history too much.

Yes, that would be another way of achieving what I want. I'll give it a try.

Cheers

-- 

Francois Suter

Work: Cobweb Development Sarl - http://www.cobweb.ch

TYPO3: Help the project! - http://typo3.org/contribute/

Appreciate my work? Support me -
http://www.monpetitcoin.com/en/francois/support-me/




More information about the TYPO3-dev mailing list