From e4f6fdcb38127754b8f0b31d202354db85553aff Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Thu, 18 Dec 2008 09:29:11 -0500 Subject: [PATCH] Patch to clarify the "unsolved conflicts" message in Stacked Git Organization: Straylight/Edgeware From: Jason Green I recently started using Stacked Git to manage my patchsets, and it's been a great tool. However, I was a bit confused for a while on how to resolve conflicts when a merge fails. Here's a patch to hopefully clarify that message a little. Signed-off-by: Jason Green Signed-off-by: Catalin Marinas --- stgit/commands/common.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stgit/commands/common.py b/stgit/commands/common.py index 10d0817..6bb3685 100644 --- a/stgit/commands/common.py +++ b/stgit/commands/common.py @@ -96,8 +96,9 @@ def check_head_top_equal(crt_series): def check_conflicts(): if git.get_conflicts(): - raise CmdException('Unsolved conflicts. Please resolve them first' - ' or revert the changes with "status --reset"') + raise CmdException('Unsolved conflicts. Please fix the conflicts' + ' then use "resolve " or revert the' + ' changes with "status --reset".') def print_crt_patch(crt_series, branch = None): if not branch: -- [mdw]