zeripath 7a428fae4b Ensure that all unmerged files are merged when conflict checking (#20528) ... 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>		2022-07-29 01:19:55 +02:00
..
agit
asymkey
attachment
auth
automerge
comments
context
cron
externalaccount
forms
gitdiff
issue
lfs
mailer
migrations
mirror
org
packages
pull	Ensure that all unmerged files are merged when conflict checking (#20528)	2022-07-29 01:19:55 +02:00
release
repository
task
user
webhook
wiki