Permalink
Browse files

Not very good, but rebase vs. merge.

  • Loading branch information...
1 parent 6340926 commit 061820e0dd87848124133f053b2386b378272604 @stephenh committed Nov 13, 2008
Showing with 15 additions and 0 deletions.
  1. +15 −0 workflow.markdown
View
@@ -60,3 +60,18 @@ topics
Topics are fairly obvious.
+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][3] scripts
+
+[3]: master/scripts/pull
+

0 comments on commit 061820e

Please sign in to comment.