@matheusbsbs / matheus-bagliano / commits / 8f41db8c37
Fork 0

Deprecate git-resolve.sh

Seriously, is anyone still using this thing? It's collecting dust and blocking the name for something potentially useful like a tool for user-friendly marking of resolved conflicts or resolving index conflicts. We've loved you when Git was young, now thank you and please go away. ;-) This makes git-resolve.sh print a big deprecation warning and sleep a bit for extra annoyance. It should be removed completely after the next release. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>

Petr Baudis committed Sep 24, 2006 at 00:25 UTC 8f41db8c370d535ed0132ef33d73e47edcc5af03
1 file changed +4
git-resolve.sh
+4
@@ -5,6 +5,10 @@
5 # Resolve two trees.
6 #
7
8 +echo 'WARNING: This command is DEPRECATED and will be removed very soon.' >&2
9 +echo 'WARNING: Please use git-merge or git-pull instead.' >&2
10 +sleep 2
11 +
12 USAGE='<head> <remote> <merge-message>'
13 . git-sh-setup
14