Commit history

1. Commits on Aug 3, 2026

   • Link conflict resolution hub from intro

     lukaskubanek

     committed
     f525df8View commit details

     Copy full SHA for f525df8

     Browse repository at this point
2. Commits on Jul 29, 2026

   • Add footnote on conflicts with identical content

     lukaskubanek

     committed
     4e7bb44View commit details

     Copy full SHA for 4e7bb44

     Browse repository at this point

   • Add reconciliation conflict sections

     lukaskubanek

     committed
     797daf1View commit details

     Copy full SHA for 797daf1

     Browse repository at this point

   • Add outcome warning to conflict-on-send section

     lukaskubanek

     committed
     f71f54dView commit details

     Copy full SHA for f71f54d

     Browse repository at this point

   • Correct timestamp handling descriptions

     lukaskubanek

     committed
     2e0582fView commit details

     Copy full SHA for 2e0582f

     Browse repository at this point

   • Fix typos

     lukaskubanek

     committed
     9d79763View commit details

     Copy full SHA for 9d79763

     Browse repository at this point

   • Add section on conflict on fetch

     lukaskubanek

     committed
     794242dView commit details

     Copy full SHA for 794242d

     Browse repository at this point
3. Commits on Jul 26, 2026

   • Switch tie-breaker to favor the server

     Show description for 3085a5d
     lukaskubanek

     committed
     3085a5dView commit details

     Copy full SHA for 3085a5d

     Browse repository at this point
4. Commits on Jan 8, 2026

   • Final touches

     lukaskubanek

     committed
     7f1f5f1View commit details

     Copy full SHA for 7f1f5f1

     Browse repository at this point

   • Add images to lifecycle section

     lukaskubanek

     committed
     90db684View commit details

     Copy full SHA for 90db684

     Browse repository at this point

   • Fix code snippet

     lukaskubanek

     committed
     1cb74ccView commit details

     Copy full SHA for 1cb74cc

     Browse repository at this point

   • Add section on row sync lifecycle

     lukaskubanek

     committed
     d6c629cView commit details

     Copy full SHA for d6c629c

     Browse repository at this point
5. Commits on Jan 7, 2026

   • Linked the model document in README.md

     lukaskubanek

     committed
     e413c78View commit details

     Copy full SHA for e413c78

     Browse repository at this point

   • Finalize section about merge model

     Show description for a6fd7f9
     lukaskubanek

     committed
     a6fd7f9View commit details

     Copy full SHA for a6fd7f9

     Browse repository at this point

   • Document merge outcomes

     lukaskubanek

     committed
     58c98b1View commit details

     Copy full SHA for 58c98b1

     Browse repository at this point

   • Start with section on core mechanics

     lukaskubanek

     committed
     c2af9a2View commit details

     Copy full SHA for c2af9a2

     Browse repository at this point
6. Commits on Jan 6, 2026

   • Add new document on built-in model

     lukaskubanek

     committed
     769f94cView commit details

     Copy full SHA for 769f94c

     Browse repository at this point

   • Tweak heading numbering

     lukaskubanek

     committed
     ccabf83View commit details

     Copy full SHA for ccabf83

     Browse repository at this point
7. Commits on Jan 5, 2026

   • Add new README.md

     lukaskubanek

     committed
     eb875cfView commit details

     Copy full SHA for eb875cf

     Browse repository at this point

   • README.md → CurrentBehavior.md

     lukaskubanek

     committed
     f3b2f6eView commit details

     Copy full SHA for f3b2f6e

     Browse repository at this point

   • Add section on “conflict on send” scenario

     lukaskubanek

     committed
     a6e2c31View commit details

     Copy full SHA for a6e2c31

     Browse repository at this point

   • Various edits

     lukaskubanek

     committed
     93edfd2View commit details

     Copy full SHA for 93edfd2

     Browse repository at this point

   • Various tweaks

     lukaskubanek

     committed
     4e1e50dView commit details

     Copy full SHA for 4e1e50d

     Browse repository at this point
8. Commits on Jan 4, 2026

   • Elaborate on problems in section 2.1

     lukaskubanek

     committed
     1afffaeView commit details

     Copy full SHA for 1afffae

     Browse repository at this point

   • Add section on “fetching server change” scenario

     lukaskubanek

     committed
     afd2690View commit details

     Copy full SHA for afd2690

     Browse repository at this point

   • Add section on “sending client change” scenario

     lukaskubanek

     committed
     534748cView commit details

     Copy full SHA for 534748c

     Browse repository at this point

   • Move library version hint to body

     lukaskubanek

     committed
     eb364aeView commit details

     Copy full SHA for eb364ae

     Browse repository at this point

   • Add section on general sync flow

     lukaskubanek

     committed
     14b1b23View commit details

     Copy full SHA for 14b1b23

     Browse repository at this point

   • Add section on per-field timestamps

     lukaskubanek

     committed
     a366ecbView commit details

     Copy full SHA for a366ecb

     Browse repository at this point

   • Initial commit

     lukaskubanek

     committed
     b51ba4dView commit details

     Copy full SHA for b51ba4d

     Browse repository at this point