feat: Implement conflict reconciliation for private directories (#431)

* feat: Implement conflict reconciliation for private directories

* fix: Make `header` public again

* chore: write basic reconciliation unit tests

* chore: Write proptest state machine utilities & proptest private reconciliation

* chore: Write better `Debug` impls

* feat: Prioritize directories over files during private directory merge

* chore: Try extracting out a failing testcase

* fix: Regression test & mock file system merge

* chore: Found failing test case

* chore: Try associating replicas with a vector clock

* refactor: Don't try to state machine proptest private reconciliation

* refactor: Remove unused dependency

* feat: Commit `Cargo.lock` and update lockfile

* chore: docs

.gitignore

@@ -1,4 +1,3 @@
-Cargo.lock
 **/target/
 
 **/.DS_Store