Skip to content

Instantly share code, notes, and snippets.

@hayderimran7

hayderimran7/rebase vs merge.md

Last active March 23, 2018 06:05
Show Gist options
  • Save hayderimran7/a57f9d27bbffc20712aec1cd93707db7 to your computer and use it in GitHub Desktop.
Save hayderimran7/a57f9d27bbffc20712aec1cd93707db7 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
rebase vs merge.md

rebase vs. merge

Merging:

Is great for cross-branch scenarios--merging candidates into stable, stable into topics, etc.
In cross-branch scenarios, fast-forwarding generally isn't preferred as seeing a no-op merge commit into stable or into a new candidate is still useful for DAG aesthetics

Rebasing:

Is great for local commits to avoid same-branch merges (where a dev has a local, unshared commit and then creates a useless merge of it into the same branch that has since moved on)
Is a PITA unless you use the pull scripts

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