Repository navigation

Post the conflict re-parent in plain git instead of uvx git-merge-onto - #68

Merged

Phlogistique merged 4 commits into

mainfrom

conflict-two-plain-merges

Nov 9, 2026

Merged

Post the conflict re-parent in plain git instead of uvx git-merge-onto#68
Phlogistique merged 4 commits into
mainfrom
conflict-two-plain-merges

Commits on Nov 6, 2026
- Post two plain merges in the conflict comment instead of git-merge-onto
  
  Phlogistique
  and
  claude
  committed
  a1fba5f
Commits on Nov 9, 2026
- Merge remote-tracking branch 'origin/main' into conflict-two-plain-merges
  Phlogistique
  committed
  d07697b
- Post a plain-git re-parent instead of two merges
  
  Phlogistique
  and
  claude
  committed
  fba1b24
- Post the re-parent as a plain git merge of a synthetic commit
  
  Phlogistique
  and
  claude
  committed
  40178d1