From edf4f599dcc78b741df36bf835cc14a1e0bafedb Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Thu, 9 Mar 2006 21:53:54 +0000 Subject: [PATCH] Pass the --aggressive flag to git-read-tree This flags solves the file removals which consumes the most time when resolving the three-way merge conflicts. Signed-off-by: Catalin Marinas --- stgit/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stgit/git.py b/stgit/git.py index 351ebbd..8306c85 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -493,7 +493,7 @@ def merge(base, head1, head2): local tree """ refresh_index() - if __run('git-read-tree -u -m', [base, head1, head2]) != 0: + if __run('git-read-tree -u -m --aggressive', [base, head1, head2]) != 0: raise GitException, 'git-read-tree failed (local changes maybe?)' # this can fail if there are conflicts -- 2.11.0