fix status updates on conflicted files

[meejah]

Fixes #731

[codecov[bot]]

Codecov Report

Merging #732 (523ea28) into main (d9a8d35) will decrease coverage by 0.03%. The diff coverage is n/a.

@@            Coverage Diff             @@
##             main     #732      +/-   ##
==========================================
- Coverage   91.78%   91.76%   -0.03%     
==========================================
  Files          38       38              
  Lines        5152     5151       -1     
  Branches      642      642              
==========================================
- Hits         4729     4727       -2     
  Misses        277      277              
- Partials      146      147       +1     

Flag	Coverage Δ
integration	72.99% <ø> (+0.11%)	:arrow_up:

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
src/magic_folder/downloader.py	99.06% <ø> (-0.01%)	:arrow_down:

... and 1 file with indirect coverage changes

:mega: We’re building smart automated test selection to slash your CI/CD build times. Learn more