From 1afd1ec1077a6d43b9492e19ea88f5928204d4cc Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sat, 28 Apr 2007 21:26:27 -0400 Subject: [PATCH] git-gui: Warn users before making an octopus merge A coworker who was new to git-gui recently tried to make an octopus merge when he did not quite mean to. Unfortunately in his case the branches had file level conflicts and failed to merge with the octopus strategy, and he didn't quite know why this happened. Since most users really don't want to perform an octopus merge this additional safety valve in front of the merge process is a good thing. Signed-off-by: Shawn O. Pearce --- git-gui.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/git-gui.sh b/git-gui.sh index f6c6d44357..dd8a408c64 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2886,6 +2886,19 @@ proc start_local_merge_action {w} { set unit branch } elseif {$revcnt <= 15} { set unit branches + + if {[tk_dialog \ + $w.confirm_octopus \ + [wm title $w] \ + "Use octopus merge strategy? + +You are merging $revcnt branches at once. This requires using the octopus merge driver, which may not succeed if there are file-level conflicts. +" \ + question \ + 0 \ + {Cancel} \ + {Use octopus} \ + ] != 1} return } else { tk_messageBox \ -icon error \ -- 2.11.4.GIT