Patch to clarify the "unsolved conflicts" message in Stacked Git

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 <jason@transgaming.com>
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 10d08171112e77909d17a8fc9f9718c52af56fba..6bb3685ca086adfdd1ba01a09b09ef9ae8c3d289 100644 (file)
--- 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():
 
 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 <files>" or revert the'
+                           ' changes with "status --reset".')

 
 def print_crt_patch(crt_series, branch = None):
     if not branch:
 
 def print_crt_patch(crt_series, branch = None):
     if not branch: