Created
February 22, 2017 18:45
-
-
Save mvanbaak/9b86b4b89c21eff0e47650b90ba816b2 to your computer and use it in GitHub Desktop.
Workflow for mautic fork
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
To make sure our work can be pushed back to upstream mautic/mautic we have to keep | |
our fork up-to-date from time to time. Also, making changes should follow the following | |
workflow to make it easy to track bugs/pull-requests etc. | |
## Updating our fork | |
Github itself has a document about syncing forks. Read it here: https://help.github.com/articles/syncing-a-fork/ | |
Quick copy/paste list: | |
cd dev/mautic/mautic | |
git fetch origin -a -p | |
git checkout master && git pull | |
git remote add upstream https://github.com/mautic/mautic.git | |
git fetch upstream | |
git merge upstream/master | |
git push | |
git checkout staging | |
git merge upstream/staging | |
git push | |
When you want to fix a bug or add new functionality, make sure you create a branch from the staging branch. | |
DO NOT COMMIT DIRECTLY TO EITHER staging NOR master branches. While this is perfectly possible, it will make keeping | |
track of different fixes and creating pull-requests against upstream a nightmare. | |
Do all your work in the branch you just created. Once done push to github. | |
Now if you go to the github interface, it will show you that you pushed changes to a branch and that | |
you can create a pull-request against the official mautic/mautic repository. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment