From: Karl Hasselström Date: Sun, 26 Aug 2007 20:43:05 GMT Subject: [StGIT PATCH 6/6] Better error message if merge fails Message-ID: <20070826204305.16700.16459.stgit@yoghurt> In-Reply-To: <20070826203745.16700.5655.stgit@yoghurt> 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 --- 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)