[StGIT PATCH 6/6] Better error message if merge fails
From: Karl Hasselström <hidden>
Date: 2016-06-15 22:43:31
Subsystem:
the rest · Maintainer:
Linus Torvalds
This message is no longer printed in case of conflicts, just in case the merge really failed; so don't talk about conflicts in the error message. Signed-off-by: Karl Hasselström <redacted> --- stgit/stack.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/stgit/stack.py b/stgit/stack.py
index d2ca0e2..080231f 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py@@ -1079,8 +1079,7 @@ class Series(PatchSet): ex.list() except git.GitException, ex: out.error('The merge failed during "push".', - 'Use "refresh" after fixing the conflicts or' - ' revert the operation with "push --undo".') + 'Revert the operation with "push --undo".') append_string(self.__applied_file, name)