fix: production conflict auto-resolve works again

[isc-tleavitt]

Fixes #526

[codecov-commenter]

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 0% with 8 lines in your changes missing coverage. Please review.

Project coverage is 25.91%. Comparing base (3e8a0f4) to head (5a327f3).

Files with missing lines	Patch %	Lines
...rceControl/Git/Util/ProductionConflictResolver.cls	0.00%	8 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #574      +/-   ##
==========================================
- Coverage   25.94%   25.91%   -0.04%     
==========================================
  Files          18       18              
  Lines        2713     2717       +4     
==========================================
  Hits          704      704              
- Misses       2009     2013       +4     

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