You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1eebbf23f0
There is yet another problem with conflicted files not being reset when the test patch resolves them. This PR adjusts the code for checkConflicts to reset the ConflictedFiles field immediately at the top. It also adds a reset to conflictedFiles for the manuallyMerged and a shortcut for the empty status in protectedfiles. Signed-off-by: Andrew Thornton <art27@cantab.net> |
2 years ago | |
---|---|---|
.. | ||
check.go | 2 years ago | |
check_test.go | 2 years ago | |
commit_status.go | 2 years ago | |
lfs.go | 2 years ago | |
main_test.go | 3 years ago | |
merge.go | 2 years ago | |
patch.go | 2 years ago | |
patch_unmerged.go | 2 years ago | |
pull.go | 2 years ago | |
pull_test.go | 3 years ago | |
review.go | 2 years ago | |
temp_repo.go | 2 years ago | |
update.go | 2 years ago |