Skip to content

Instantly share code, notes, and snippets.

@ahadshafiq
Created April 8, 2013 13:15
Show Gist options
  • Save ahadshafiq/5336688 to your computer and use it in GitHub Desktop.
Save ahadshafiq/5336688 to your computer and use it in GitHub Desktop.
Git workflow to follow
http://nvie.com/posts/a-successful-git-branching-model/
Master
Develop
Feature1
Feature2
Feature3
Get original source updates to master. By git pull origin originalmaster.
Check where git remote is for originamaster. git remote -v
git checkout develop
git rebase master
if the feature branches were create before this rebase into the intermediate
develop branch, then I need to rebase the feature branches too.
git checkout Feature1
git rebase develop
All testing and a test deployment is done on the develop branch.
Feature branches need to make Pull Requests to the develop branch.
The develop branch is then merged into the master branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment