Hello and thanks for reading,
I've a Redis pull request that no longer applies because, for example, one line where there was
a < b is now
a > b,
otherwise the patch would apply cleanly.
if I try to cherry pick the commit and resolve the conflicts, it works, it's just a lot of useless work editing the conflicting code to merge properly and there is even the risk of making mistakes.
An alternative is to:
- Modify back the source code to
a < bwith a commit called FOO.