Skip to content

Instantly share code, notes, and snippets.

@MGalv
Created February 1, 2013 19:51
Show Gist options
  • Save MGalv/4693635 to your computer and use it in GitHub Desktop.
Save MGalv/4693635 to your computer and use it in GitHub Desktop.
Git flow propossal
Initial setup
$git clone https://grant_hudgens@bitbucket.org/NikkiD/phoenix.git
$git branch development
$git checkout development
$git pull origin development
Push commits to remote
$git checkout development
$git pull origin development
$git branch epic-<something>
$git checkout epic-<something>
$vi all_the_files.txt
$git add all_the_files.txt
$git commit -m "I changed these things"
$git checkout development
$git pull origin development
$git checkout epic-<something>
$git rebase origin development
$git push origin epic-<something>
*After tests passing (Only the server/admin/bamboo)
$git merge epic-<something>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment