PoC for labelling merge conflicts

[hauntsaninja]

[codecov[bot]]

Codecov Report

Merging #530 (d25c6d3) into main (b12ebac) will decrease coverage by 1.11%. The diff coverage is 25.80%.

@@             Coverage Diff             @@
##              main     #530      +/-   ##
===========================================
- Coverage   100.00%   98.88%   -1.12%     
===========================================
  Files           18       19       +1     
  Lines         2034     2064      +30     
  Branches       231      242      +11     
===========================================
+ Hits          2034     2041       +7     
- Misses           0       22      +22     
- Partials         0        1       +1     

Flag	Coverage Δ
Python_3.10.9	98.88% <25.80%> (-1.12%)	:arrow_down:
Python_3.11.1	98.88% <25.80%> (-1.12%)	:arrow_down:
Python_3.12.0-alpha.3	?
Python_3.8.15	98.93% <26.66%> (-1.07%)	:arrow_down:
Python_3.9.16	98.93% <26.66%> (-1.07%)	:arrow_down:

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

Impacted Files	Coverage Δ
bedevere/conflict.py	23.33% <23.33%> (ø)
bedevere/__main__.py	100.00% <100.00%> (ø)