From 061820e0dd87848124133f053b2386b378272604 Mon Sep 17 00:00:00 2001 From: Stephen Haberman Date: Wed, 12 Nov 2008 22:08:08 -0600 Subject: [PATCH] Not very good, but rebase vs. merge. --- workflow.markdown | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/workflow.markdown b/workflow.markdown index 7a7c074..4668562 100644 --- a/workflow.markdown +++ b/workflow.markdown @@ -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 + -- 2.39.5