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

Function test_merge_fail_on_conflict

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

Source from the content-addressed store, hash-verified

179
180
181def test_merge_fail_on_conflict(mergerepo: Repository) -> None:
182 branch_head = pygit2.Oid(hex='1b2bae55ac95a4be3f8983b86cd579226d0eb247')
183
184 with pytest.raises(pygit2.GitError, match=r'merge conflicts exist'):
185 mergerepo.merge(
186 branch_head, flags=MergeFlag.FIND_RENAMES | MergeFlag.FAIL_ON_CONFLICT
187 )
188
189
190def test_merge_commits(mergerepo: Repository) -> None:

Callers

nothing calls this directly

Calls 1

mergeMethod · 0.80

Tested by

no test coverage detected

Used in the wild real call sites across dependent graphs

searching dependent graphs…