The setup wizard interactively configures your flow and neos forks and will also create the forks for you if needed. It further renames the original remotes to "upstream" and adds your fork as remote with name "origin".
./flow github:setup
The command
./flow github:createPullRequestFromGerrit <gerritPatchId>
transfers a gerrit patch to a github pull request. In detail it does the following steps:
- Pull the change as patch from gerrit
- Create a new branch for that patch from upstream/master
- Patch the code and create a new commit
- Push the commit to your fork on github
- Create a pull request
- Switch local repository back to master
These are the steps you have to do to manually move a gerrit patch to github. The example commands move a patch for the package TYPO3.TYPO3CR.
-
Go to your change on https://review.typo3.org
-
Download the patch file and extract it
-
Bring your local repository and code up to date with the upstream repository
-
Navigate to the package directory (e.g. Packages/Neos/TYPO3.TYPO3CR/)
-
Add a new branch.
-
Patch your code using
git am
. Example:git am --directory TYPO3.TYPO3CR /tmp/GerritPatches/99194a75.diff
-
Commit the changes
-
Push the changes to origin/branchName
-
Go to github and open a pull request
-
Abandon the change on gerrit.