projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
37ed0b8
)
Git.vala
author
Alan Knowles
<alan@roojs.com>
Fri, 15 Mar 2019 03:31:45 +0000
(11:31 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 15 Mar 2019 03:31:45 +0000
(11:31 +0800)
Git.vala
patch
|
blob
|
history
diff --git
a/Git.vala
b/Git.vala
index
ba9b8e4
..
304208d
100644
(file)
--- a/
Git.vala
+++ b/
Git.vala
@@
-198,6
+198,15
@@
namespace GitLive {
var anc_oid = this.repo.merge_base(master_commit.get_id(), head_commit.get_id());
var anc_oid = this.repo.merge_base(master_commit.get_id(), head_commit.get_id());
+ var anc_commit = this.repo.lookup_commit(anc_oid);
+ var anc_tree = anc_commit.get_tree();
+
+ var master_tree = master_commit.get_tree();
+ var head_tree = head_commit.get_tree();
+ var mo = new Ggit.MergeOptions();
+ mo.set_file_favor(Ggit.MergeFileFavor.THEIRS);
+ var ix = this.repo.merge_trees(anc_tree, master_tree, head_tree, mo);
+
}
}