()
| 51 | |
| 52 | |
| 53 | def _make_conflict(): |
| 54 | cmd_output('git', 'checkout', 'origin/master', '-b', 'foo') |
| 55 | with open('conflict_file', 'w') as conflict_file: |
| 56 | conflict_file.write('herp\nderp\n') |
| 57 | cmd_output('git', 'add', 'conflict_file') |
| 58 | with open('foo_only_file', 'w') as foo_only_file: |
| 59 | foo_only_file.write('foo') |
| 60 | cmd_output('git', 'add', 'foo_only_file') |
| 61 | git_commit(msg=_make_conflict.__name__) |
| 62 | cmd_output('git', 'checkout', 'origin/master', '-b', 'bar') |
| 63 | with open('conflict_file', 'w') as conflict_file: |
| 64 | conflict_file.write('harp\nddrp\n') |
| 65 | cmd_output('git', 'add', 'conflict_file') |
| 66 | with open('bar_only_file', 'w') as bar_only_file: |
| 67 | bar_only_file.write('bar') |
| 68 | cmd_output('git', 'add', 'bar_only_file') |
| 69 | git_commit(msg=_make_conflict.__name__) |
| 70 | cmd_output('git', 'merge', 'foo', check=False) |
| 71 | |
| 72 | |
| 73 | @pytest.fixture |
no test coverage detected