You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

6543 210b096da7 Ensure that all unmerged files are merged when conflict checking (#20528) (#20536) ... There is a subtle bug in the code relating to collating the results of `git ls-files -u -z` in `unmergedFiles()`. The code here makes the mistake of assuming that every unmerged file will always have a stage 1 conflict, and this results in conflicts that occur in stage 3 only being dropped. This PR simply adjusts this code to ensure that any empty unmergedFile will always be passed down the channel. The PR also adds a lot of Trace commands to attempt to help find future bugs in this code. Fix #19527 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net>		2 years ago
..
check.go	…
check_test.go	…
commit_status.go	…
edits.go	…
lfs.go	…
main_test.go	…
merge.go	…
patch.go	Ensure that all unmerged files are merged when conflict checking (#20528) (#20536)	2 years ago
patch_unmerged.go	Ensure that all unmerged files are merged when conflict checking (#20528) (#20536)	2 years ago
pull.go	…
pull_test.go	…
review.go	Dismiss prior pull reviews if done via web in review dismiss (#20197) (#20407)	2 years ago
temp_repo.go	…
update.go	…