Refactor/tidy up three way merge

[martin-cs]

This tidies up a few things around VSD's three way merge. It should have no externally visible effect.

[codecov]

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (3535b61) 79.11% compared to head (515f263) 78.85%.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #7929      +/-   ##
===========================================
- Coverage    79.11%   78.85%   -0.27%     
===========================================
  Files         1701     1701              
  Lines       196271   196265       -6     
===========================================
- Hits        155280   154758     -522     
- Misses       40991    41507     +516     

Files	Coverage Δ
...nsitivity/three_way_merge_abstract_interpreter.cpp	93.18% <100.00%> (+0.07%)	⬆️
...sitivity/variable_sensitivity_dependence_graph.cpp	85.05% <ø> (ø)
...ensitivity/variable_sensitivity_dependence_graph.h	78.68% <ø> (ø)
...riable-sensitivity/variable_sensitivity_domain.cpp	90.10% <100.00%> (+0.16%)	⬆️
...variable-sensitivity/variable_sensitivity_domain.h	100.00% <ø> (ø)

... and 33 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[martin-cs]

Anyone know why CodeCov is failing?

[2023-09-28T16:22:09.663Z] ['error'] There was an error running the uploader: Error uploading to [https://codecov.io:](https://codecov.io/) Error: There was an error fetching the storage URL during POST: 404 - {'detail': ErrorDetail(string='Unable to locate build via Github Actions API. Please upload with the Codecov repository upload token to resolve issue.', code='not_found')}
[2023-09-28T16:22:09.664Z] ['verbose'] The error stack is: Error: Error uploading to [https://codecov.io:](https://codecov.io/) Error: There was an error fetching the storage URL during POST: 404 - {'detail': ErrorDetail(string='Unable to locate build via Github Actions API. Please upload with the Codecov repository upload token to resolve issue.', code='not_found')}
    at main (/snapshot/repo/dist/src/index.js)
    at processTicksAndRejections (node:internal/process/task_queues:96:5)

[tautschnig]

Anyone know why CodeCov is failing?

[2023-09-28T16:22:09.663Z] ['error'] There was an error running the uploader: Error uploading to [https://codecov.io:](https://codecov.io/) Error: There was an error fetching the storage URL during POST: 404 - {'detail': ErrorDetail(string='Unable to locate build via Github Actions API. Please upload with the Codecov repository upload token to resolve issue.', code='not_found')}
[2023-09-28T16:22:09.664Z] ['verbose'] The error stack is: Error: Error uploading to [https://codecov.io:](https://codecov.io/) Error: There was an error fetching the storage URL during POST: 404 - {'detail': ErrorDetail(string='Unable to locate build via Github Actions API. Please upload with the Codecov repository upload token to resolve issue.', code='not_found')}
    at main (/snapshot/repo/dist/src/index.js)
    at processTicksAndRejections (node:internal/process/task_queues:96:5)

I believe this is a throttling issue. Just happens from time to time, a re-run typically resolves this.

[martin-cs]

One test fails which is a 0.27% drop in project coverage. I think this is an artefact of measurement because I am removing lines. The patch coverage is 100% so I am going to merge it.