Skip to content

Instantly share code, notes, and snippets.

@brandon-beacher

brandon-beacher/gist:2695246

Created May 14, 2012 17:36
Show Gist options
  • Save brandon-beacher/2695246 to your computer and use it in GitHub Desktop.
Save brandon-beacher/2695246 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.md

Git Workflow

Branch from master

Branch from master, naming your branch with your initials, the Tracker Story ID, and a description of the story.

Here is an example branch name:

bgb/24096875_add_vcard_column_auto_mapping

Submit a pull request

When work on your branch is complete and tested, visit your branch in Github and submit a pull request:

Screen shot of pull request

Now you'll be waiting on your pull request to be merged into master.

Branch again

Branch from your previous branch

It's likely your next story will depend upon your previous branch. If your previous branch has yet to be merged into master, you'll need to branch from your previous branch to continue working while you're waiting on the merge.

Branch from master

If your next story does not depend upon your previous branch, or if your previous branch has already been merged into master, you can branch from master.

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