Conflicts Resolution

Concurrent updates: application-specific merge.

Forks - handled the same way as concurrent updates.

  • Application-specific merge.

  • Proof Of Misbehaviour (POM).

  • I-vouch-for-this certificates.