From 808d80f8b0b7a53ff3dcfab50e863e473678cd79 Mon Sep 17 00:00:00 2001 Message-Id: <808d80f8b0b7a53ff3dcfab50e863e473678cd79.1746976924.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 12 Oct 2008 17:03:51 +0200 Subject: [PATCH] Tutorial: Talk about conflicts when introducing StGit MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Organization: Straylight/Edgeware From: Karl Hasselström Conflicts and conflict resolving are essential features of StGit, so we'd better tell the user about them. Signed-off-by: Karl Hasselström --- Documentation/stg.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/stg.txt b/Documentation/stg.txt index 5973a6b..fc8fd7c 100644 --- a/Documentation/stg.txt +++ b/Documentation/stg.txt @@ -38,6 +38,14 @@ to maintain a 'patch stack' on top of a Git branch: an updated branch, you can take all your patches and apply them on top of the updated branch. + * As you would expect, changing what is below a patch can cause that + patch to no longer apply cleanly -- this can occur when you + reorder patches, rebase patches, or refresh a non-topmost patch. + StGit uses Git's rename-aware three-way merge capability to + automatically fix up what it can; if it still fails, it lets you + manually resolve the conflict just like you would resolve a merge + conflict in Git. + * The patch stack is just some extra metadata attached to regular Git commits, so you can continue to use most Git tools along with StGit. -- [mdw]