[TYPO3-core] Collaborating with sandboxes
xavier.perseguers at typo3.org
Wed Apr 6 13:58:15 CEST 2011
Of course I tried "git pull" :)
And yes I changed something locally, otherwise I would not have tried to
> My suggested fix is:
> # checkout local branch
> git checkout RFC_25403
> # put all commits into the front, that are not yet known upstream
> git rebase origin/sandbox/xperseguers/RFC_25403
> # git push
Will do that. Did not know with the message whether I should have
declared "two" remotes or something like that and I thought "rebase" was
done automatically when doing git pull.
I tried and it fails with 2 conflicts related to what I changed locally
(and committed) and wanted to push on my sandbox. Will resolve that
manually later and try to push again. Strange though.
Release Manager TYPO3 4.6
TYPO3 .... inspiring people to share!
Get involved: http://typo3.org
More information about the TYPO3-team-core