Git Rebase Workflow

I’ve been working on a set of instructions that walk you through a typical Git workflow using rebase and topic branches.

Git Rebase Workflow Documentation

It consists of five steps:

  1. Create Topic Branch
  2. Commit Code Modifications
  3. Rebase onto Parent Branch
  4. Resolve Rebase Conflicts
  5. Merge Topic Branch into Parent Branch

I’ve also put together a quick reference sheet that only lists the basic Git commands in the workflow.

Git Rebase Workflow Reference Sheet

Feel free to leave some suggestions in the comments.

Advertisements

~ by Conch Connoisseur on October 9, 2013.

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

 
%d bloggers like this: