From: Petr Baudis Date: Sat, 23 Sep 2006 22:25:19 GMT Subject: [PATCH] Deprecate git-resolve.sh Message-ID: <20060923222444.18230.94482.stgit@machine.or.cz> In-Reply-To: <7v64fensge.fsf@assigned-by-dhcp.cox.net> 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 --- I won't touch git-merge-recursive.py because I really have no clue how those fancy merge drivers work. git-resolve.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/git-resolve.sh b/git-resolve.sh index a7bc680..729ec65 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