From: Jason Green Date: Thu, 18 Dec 2008 14:29:11 +0000 (-0500) Subject: Patch to clarify the "unsolved conflicts" message in Stacked Git X-Git-Tag: v0.15-rc1~61 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/e4f6fdcb38127754b8f0b31d202354db85553aff?ds=inline;hp=-c 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 Signed-off-by: Catalin Marinas --- e4f6fdcb38127754b8f0b31d202354db85553aff 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: