Alexis Sellier 2d55ffba81 cob: Redesign merge state ...

Move `merges` from `Revision` to `Patch`, and key them by actor.

This ensures that only one merge is possible per actor. We also make
sure that only one revision can be merged at a time, and signal a
conflict if more than one revision is considered merged.

Finally, we make sure that merges have the same target-branch commit
to be considered equal.

2023-05-19 18:40:46 +02:00

..

examples

cli: Fix some tests that are no longer valid

2023-05-17 16:54:30 +02:00

src

cob: Redesign merge state

2023-05-19 18:40:46 +02:00

tests

cli: Merge patches on git push

2023-05-16 21:11:57 +02:00

Cargo.toml

Update dependencies

2023-05-10 15:56:21 +02:00