zgulde/git-workflow.md

Last active September 13, 2016 06:22

Star (3) 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/zgulde/27c29d27b01e31ffe0120233ac3e6015.js"></script>
Save zgulde/27c29d27b01e31ffe0120233ac3e6015 to your computer and use it in GitHub Desktop.

Download ZIP

Raw

git-workflow.md

git workflow for team projects

Create a branch for the feature you will be working on and switch to it

git branch myname-feature-name
git checkout myname-feature-name

work on your feature, add commit, etc
Open a pull request to merge your branch back into master

git push origin myname-feature-name

open pull request from repo page on github.com

After a pull request has been merged we'll need to get our local git repository in sync with our remote

Make sure you've commited any changes on your branch
switch to the master branch
```
git checkout master
```
get your master branch up to speed with the remote
```
git pull origin master
```
switch back to your branch
```
git checkout myname-feature-name
```
merge the new changes
```
git merge master
```

ghost commented Sep 13, 2016

Thanks for formatting this so nicely Zach, I am referencing it in my sites internal coding standards :)

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