pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-05 11:36:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #280 from pre-commit/no__rebase_on_pull

Browse source 
pull with --no-rebase
This commit is contained in:
Anthony Sottile 2018-03-26 08:43:59 -07:00 • committed by GitHub
commit 71fadeb238
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/check_merge_conflict_test.py
View file

@ -37,7 +37,7 @@ def f1_is_a_conflict_file(tmpdir):
with repo2.as_cwd(): with repo2.as_cwd():
repo2_f1.write('child\n') repo2_f1.write('child\n')
cmd_output('git', 'commit', '--no-gpg-sign', '-am', 'clone commit2') cmd_output('git', 'commit', '--no-gpg-sign', '-am', 'clone commit2')
cmd_output('git', 'pull', retcode=None) cmd_output('git', 'pull', '--no-rebase', retcode=None)
# We should end up in a merge conflict! # We should end up in a merge conflict!
f1 = repo2_f1.read() f1 = repo2_f1.read()
assert f1.startswith( assert f1.startswith(