There was an error while loading. Please reload this page.
Welcome to the git-flow-cheatsheet wiki!
merging vs rebasing (Atlassian)