Correctly update conflicted files

[meejah]

Fixes #719

[codecov[bot]]

Codecov Report

Merging #726 (18d027e) into main (82056a8) will increase coverage by 0.00%. The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main     #726   +/-   ##
=======================================
  Coverage   91.79%   91.79%           
=======================================
  Files          38       38           
  Lines        5141     5144    +3     
  Branches      639      640    +1     
=======================================
+ Hits         4719     4722    +3     
  Misses        277      277           
  Partials      145      145           

Flag	Coverage Δ
integration	72.97% <71.42%> (-0.03%)	:arrow_down:

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

Impacted Files	Coverage Δ
src/magic_folder/scanner.py	98.18% <ø> (-0.05%)	:arrow_down:
src/magic_folder/magic_file.py	96.23% <100.00%> (+0.04%)	:arrow_up:

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