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

[Georg Ringer]

Hi,

thanks!

Am 16.11.2011 08:46, schrieb Björn Pedersen:
> git checkout origin/bemodule -b fo
> git rebase -i origin/master

ok I got it working local but again I can't push it to remote branch 
origin/bemodule

tried
git commit -a --amend
remove changeid
git push origin HEAD:refs/for/bemodule => refs/for/bemodule (change 6500 
closed), eerror failed ...

thx
georg