cseeman

A forking rebase wokflow with GitHub is a common Git workflow, whether you're trying to work on open source or collaborating on work projects or your own.

Knowing how to properly fork and generate pull requests is essential.

It is easy to make mistakes when you're learning the process. In an attempt to gather this information for myself and others, this short tutorial for creating a fork, doing your work, issuing a pull request, and merging that pull request back into the original project.

Creating a Fork

On the GitHub page and click the "Fork" button. Once you've done that, you can use your favorite git client to clone your repo or just head straight to the command line (my method of choice):

cseeman

Updating a feature branch

First we'll update your local develop branch. Go to your local project and check out the branch you want to merge into (your local develop branch)

$ git checkout develop

Fetch the remote, bringing the branches and their commits from the remote repository. You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits to develop will be stored in a local branch, remotes/origin/develop