valeth/rebase-workflow.md

Last active December 1, 2017 10:07

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/valeth/92f7f4d371403a758057c0864714fddb.js"></script>
Save valeth/92f7f4d371403a758057c0864714fddb to your computer and use it in GitHub Desktop.

Download ZIP

Git Rebase Workflow

Raw

rebase-workflow.md

Git Rebase-based Workflow

Keeps your project more organized by splitting features into separate branches for review.
Avoids merge commits and keep your git history clean.

Repeat this process for every feature you want to add.

Make sure the master branch of your fork is even with upstream/master
Create a feature branch, leave the master branch untouched (important!)
Make your changes in your feature branch
Create a PR/MR to upstream
1. Review changes in PR/MR
2. Choose rebase merging as merging strategy (can be set in GH repository configuration)
Delete the feature branch (optional)

Note:

If the feature takes a while to develop it's quite likely that it will diverge from master. So rebase the feature branch to upstream/master on a regular basis.

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