~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix the added to both but different conflict
[stgit]
/
stgit
/
gitmergeonefile.py
diff --git
a/stgit/gitmergeonefile.py
b/stgit/gitmergeonefile.py
index
c603ff8
..
c3aaa2a
100644
(file)
--- a/
stgit/gitmergeonefile.py
+++ b/
stgit/gitmergeonefile.py
@@
-205,6
+205,8
@@
def merge(orig_hash, file1_hash, file2_hash,
return 1
# files are different
else:
+ # reset the index to the current file
+ os.system('git-update-index -- %s' % path)
print >> sys.stderr, \
'Error: File "%s" added in branches but different' % path
__conflict(path)