radicle-heartwood-lfs/radicle
Alexis Sellier e18f01cab4
radicle: Be more lenient when applying merge ops
Before this change, if a merge op referred to a commit that was not on
the default branch, the merge op and all descendant ops would be pruned.

This is a bad idea because the state of the default branch can change
*after* the merge op is created, which is out of the control of the
merge op author.

Therefore, instead of exiting, we keep processing ops (but ignore the
merge), in case the merge is invalid for this specific reason.
2023-05-25 11:29:54 +02:00
..
src radicle: Be more lenient when applying merge ops 2023-05-25 11:29:54 +02:00
Cargo.toml Update dependencies 2023-05-10 15:56:21 +02:00