[TYPO3-dev] [GIT] How to merge branches

[Steffen Gebert]

Hi,

> is there already a date for the new version?
A new (stable, 2.2.2) Gerrit version is in the pipe, according to their 
mailing list. I guess it comes out this month.
Don't know, when Peter and Karsten plan to update. 2.2.0 introduced some 
changes in the way, the data is saved.

> is it possible to create 1 diff file which gets me the changes in master
> to bemodule and I would then just apply this as normal change?

git diff master bemodule ?
You can check that be typing `git log master bemodule` first.
Syntax is `git whatever in-this-branch but-not-in-this-branch`


Kind regards
Steffen

-- 
Steffen Gebert
TYPO3 v4 Core Team Member
TYPO3 Server Administration Team Member

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