Skip to content

Instantly share code, notes, and snippets.

@mshmsh5000

mshmsh5000/ds-github-flow.md

Created June 10, 2014 19:52
Show Gist options
  • Save mshmsh5000/f3f7dff8186ec5d5aba1 to your computer and use it in GitHub Desktop.
Save mshmsh5000/f3f7dff8186ec5d5aba1 to your computer and use it in GitHub Desktop.
Download ZIP
DoSomething.org's almost-GitHub flow
Raw
ds-github-flow.md
  • Fork the main repo
  • Make the fork your origin, and clone locally
  • Work from the dev branch. dev is your home base
  • Before you start work, update your local dev from upstream/dev
    • git checkout dev
    • git fetch upstream
    • git merge upstream/dev
    • git push origin
  • Branch from dev locally
  • Add and commit there
  • Push that branch to origin (your fork)
  • Create the pull request between that branch and the main repo's dev branch
  • After the PR is reviewed and approved, merge into main dev branch
  • Delete your feature branch
  • Repeat
@sergiitk
Copy link

@angaither
Reminds GitFlow. There's also a git plugin to make it easier. Never used it though.

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