cfarm/github-flow.md

Last active August 29, 2015 14:03

Star (1) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/cfarm/80c953351da16604792c.js"></script>
Save cfarm/80c953351da16604792c to your computer and use it in GitHub Desktop.

Download ZIP

Github Flow

Raw

github-flow.md

Create a new branch from master:
git checkout master or git status to confirm you're working on master
git branch my-new-branch
Check out the new branch!!!

git checkout my-new-branch

Make commits on this branch
git add filename
git commit -m "i edited a file"
Push commits to remote repository (Github):

git push origin my-new-branch

This will create the branch on Github.

When you're ready for the branch to be reviewed, it's PULL REQUEST TIME. Go to the repository and click the BIG GREEN BUTTON
IF you can't merge through Github then you need to do it manually. Commands:
git checkout master
Then make sure you're up to date with git pull
git merge my-new-branch
git push origin master
Once your Pull Request is approved and merged to master, you'll need to take an additional step to deploy it to the Client site by merging it to the production branch.
git checkout production
git merge master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment