MCPcopy Create free account
hub / github.com/libgit2/pygit2 / test_merge_commits_favor

Function test_merge_commits_favor

test/test_merge.py:205–215  ·  view source on GitHub ↗
(mergerepo: Repository)

Source from the content-addressed store, hash-verified

203
204
205def test_merge_commits_favor(mergerepo: Repository) -> None:
206 branch_head = pygit2.Oid(hex='1b2bae55ac95a4be3f8983b86cd579226d0eb247')
207
208 merge_index = mergerepo.merge_commits(
209 mergerepo.head.target, branch_head, favor=MergeFavor.OURS
210 )
211 assert merge_index.conflicts is None
212
213 # Incorrect favor value
214 with pytest.raises(TypeError, match=r'favor argument must be MergeFavor'):
215 mergerepo.merge_commits(mergerepo.head.target, branch_head, favor='foo') # type: ignore
216
217
218def test_merge_trees(mergerepo: Repository) -> None:

Callers

nothing calls this directly

Calls 1

merge_commitsMethod · 0.80

Tested by

no test coverage detected

Used in the wild real call sites across dependent graphs

searching dependent graphs…