Code

Updates to Merge2 for Share#5287

Code

Draft

ChrisPenner wants to merge 11 commits intotrunkunisonweb/unison:trunkfrom cp/synhash-depsunisonweb/unison:cp/synhash-depsCopy head branch name to clipboard

+268-51

Commits

Commits on Aug 15, 2024

• Use separate PPE for each of LCA/Alice/Bob when computing synhashes.

  ChrisPenner

  committed
  973636b

• Build and pass in the appropriate merge PPED for alice/bob/lca

  ChrisPenner

  committed
  9df178d

Commits on Aug 19, 2024

• Add eitherToThese to prelude

  ChrisPenner

  committed
  be313bc

• Split off propagated updates when computing diff

  ChrisPenner

  committed
  0daa489

• Add Human Diff machinery

  ChrisPenner

  committed
  01fff50

• Wire up a working humanized diff.

  ChrisPenner

  committed
  bba8722

• Fix up hydrated defns labeled dependencies

  ChrisPenner

  committed
  de79fe8

Commits on Aug 21, 2024

• Add semigroup/monoid to nametree

  ChrisPenner

  committed
  020d9c6

• Add optics for Defns

  ChrisPenner

  committed
  5071528

• Add Eq, Ord to Defn combinators

  ChrisPenner

  committed
  821ec04

Commits on Aug 22, 2024

• Add for to Set Utils

  ChrisPenner

  committed
  375cb30