From 8f41db8c370d535ed0132ef33d73e47edcc5af03 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Sun, 24 Sep 2006 00:25:19 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-resolve.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/git-resolve.sh b/git-resolve.sh index a7bc680d9..729ec65dc 100755 --- a/git-resolve.sh +++ b/git-resolve.sh @@ -5,6 +5,10 @@ # Resolve two trees. # +echo 'WARNING: This command is DEPRECATED and will be removed very soon.' >&2 +echo 'WARNING: Please use git-merge or git-pull instead.' >&2 +sleep 2 + USAGE=' ' . git-sh-setup -- 2.30.2