| commit | 1afd1ec1077a6d43b9492e19ea88f5928204d4cc | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 29 Apr 2007 01:26:27 +0000 (28 21:26 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 2 May 2007 17:06:09 +0000 (2 13:06 -0400) | ||
| tree | 4029b85b39a8365d932d9c2ab2cb1e5984ca64cb | treesnapshot (tar.gz zip) |
| parent | 2f1a955b99954fd18c512244e1321dc4cff856b4 | commitdiff |
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 <spearce@spearce.org>
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 <spearce@spearce.org>
| git-gui.sh | diffblobblamehistory |