(mergerepo: Repository)
| 179 | |
| 180 | |
| 181 | def 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 | |
| 190 | def test_merge_commits(mergerepo: Repository) -> None: |
nothing calls this directly
no test coverage detected
searching dependent graphs…