~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass the --aggressive flag to git-read-tree
[stgit]
/
stgit
/
git.py
diff --git
a/stgit/git.py
b/stgit/git.py
index
351ebbd
..
8306c85
100644
(file)
--- a/
stgit/git.py
+++ b/
stgit/git.py
@@
-493,7
+493,7
@@
def merge(base, head1, head2):
local tree
"""
refresh_index()
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
raise GitException, 'git-read-tree failed (local changes maybe?)'
# this can fail if there are conflicts