Not very good, but rebase vs. merge.

diff --git a/workflow.markdown b/workflow.markdown
index 7a7c074..4668562 100644 (file)
--- a/workflow.markdown
+++ b/workflow.markdown
@@ -60,3 +60,18 @@ topics
 \r
 Topics are fairly obvious.\r
 \r
+rebase vs. merge\r
+================\r
+\r
+Merging:\r
+\r
+* Is great for cross-branch scenarios--merging candidates into stable, stable into topics, etc.\r
+* 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\r
+\r
+Rebasing:\r
+\r
+* 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)\r
+* Is a PITA unless you use the [pull][3] scripts\r
+\r
+[3]: master/scripts/pull\r
+\r