OXYGENHUB

Merge main into identical-sides: keep both changelog entries 78b49d4d01f0 resolution

Author
Andy McCall @andymccall <[email protected]>
via
agent agent:claude@andymccall <[email protected]> · keyless, under your grant for changes,refs,seal · key af56a5b3bf34
When
· 2026-10-26 19:25 UTC
Signature
◈ sealed by agent:claude@andymccall
Hash
78b49d4d01f02cf8dbb613b49369c7d6eb82ed3a8218dcdbe0bb65960ad33bf0
Depends on
642fa213de80 80b069facc69 8fd78eb52ad2 c0d4075cadc0 e4595038502a
Depended on by
fa53a2849de8
In bookmarks
identical-sides main subrepo-pin-state
In tags
v0.10.0 v0.11.0 v0.8.0 v0.9.0
Edits
2 atoms, 0 tree operations, 1 file

Browse the tree at this change

show whitespace changes
modified CHANGELOG.md +4 −4
… 
1 unchanged lines
2 2 

    

  
    

      3
      3
       
      
## Unreleased

    

  
    

      4
      4
       
      

    

  
    

      5
      
      -
      
<<<<<<< oxy conflict 1 of 1, side 1 of 2: change b8def1cd "oxy-server: a host can add a note to a reference a push moved (closes #148)"

    

  
    

      6
      
      -
      
- **A server can add a note to a reference a push moved (#148).** `oxy-server`'s `Backend` has a `push_notes` step: each note is added to that accepted reference's result, which `oxy push` shows in place of "updated". OxygenHub will use it to say when a push moves the bookmark of a proposal that has already landed (oxygenhub#329).

    

  
    

      7
      
      -
      

    

  
    

      8
      
      -
      
======= oxy conflict 1 of 1, side 2 of 2: change ece7ee78 "Identical conflict sides settle by themselves, keeping one, in any file (closes #146)"

    

  
    

      
      5
      +
      
- **A server can add a note to a reference a push moved (#148).** `oxy-server`'s `Backend` has a `push_notes` step: each note is added to that accepted reference's result, which `oxy push` shows in place of "updated". OxygenHub will use it to say when a push moves the bookmark of a proposal that has already landed (oxygenhub#329).

    

  
    

      
      6
      +
      

    

  
    

      
      7
      +
      
- **Identical sides settle by themselves (#146).** Two bookmarks that each resolved the same conflict to the same text conflicted again when merged, both sides the identical lines. A conflict whose sides are byte-identical now settles as `merge=union` adjacent insertions do (#145), in any file and keeping one side: a checkout writes it once ("kept one of its identical sides") and the next commit records the resolution, and a host landing a proposal settles it too.

    

  
    

      
      8
      +
      

    

  
    

      9
      9
       
      
- **Identical sides settle by themselves (#146).** Two bookmarks that each resolved the same conflict to the same text conflicted again when merged, both sides the identical lines. A conflict whose sides are byte-identical now settles as `merge=union` adjacent insertions do (#145), in any file and keeping one side: a checkout writes it once ("kept one of its identical sides") and the next commit records the resolution, and a host landing a proposal settles it too.

    

  
    

      10
      10
       
      

    

  
    

      11
      11
       
      
>>>>>>> oxy conflict 1 of 1 end

    

  
    

      
      
      …
      
286 unchanged lines