Resolve replace conflicts by keeping a candidate (P1e) issue #21
closed: completed andymccall opened this · 0 comments
andymccall
A binary file's replace conflict (two changes replace the same blob) could not be resolved by keeping an existing candidate. Writing a candidate's bytes counted as no change, so OxygenHub's resolver could not offer it.
Resolving should be possible when the caller names the path. A plain snapshot should still never settle one on its own.
A binary file's replace conflict (two changes replace the same blob) could not be resolved by keeping an existing candidate. Writing a candidate's bytes counted as no change, so OxygenHub's resolver could not offer it.
Resolving should be possible when the caller names the path. A plain snapshot should still never settle one on its own.