OXYGENHUB

Merge main into subrepo-pin-state: keep both changelog entries fa53a2849de8 resolution

Author
Andy McCall @andymccall <[email protected]>
via
agent agent:claude@andymccall <[email protected]> · keyless, under your grant for changes,refs,seal · key 7ec6cc10c1bc
When
· 2026-10-27 00:00 UTC
Signature
◈ sealed by agent:claude@andymccall
Hash
fa53a2849de8c3e11ee3504c97eaae90de7bb38578d4c6ce04ce27572edab824
Depends on
78b49d4d01f0 7a3cc5149a14 80b069facc69 8fd78eb52ad2 e4595038502a
Depended on by
4275ecb110f5 aa137bb8e77d
In bookmarks
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

hide whitespace changes
modified CHANGELOG.md +8 −8
… 
1 unchanged lines
2 2 

    

  
    

      3
      3
       
      
## Unreleased

    

  
    

      4
      4
       
      

    

  
    

      5
      
      -
      
<<<<<<< oxy conflict 1 of 1, side 1 of 2: change 559880de "Merge main into subrepo-pin-state: keep both changelog entries"

    

  
    

      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
      
      -
      
- **A subrepo at its pinned state is unmodified on any bookmark (#147).** A subrepo whose heads were exactly its pin's but which sat on another bookmark than the pin named counted as modified, so `oxy bookmark switch` refused ("the working copy has changes"). Only the state counts now: the same repository at the same heads, or the same Git commit; the recorded pin stands.

    

  
    

      9
      
      -
      

    

  
    

      10
      
      -
      
======= oxy conflict 1 of 1, side 2 of 2: change 7688cfb4 "Merge main into identical-sides: keep both changelog entries"

    

  
    

      11
      
      -
      
- **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).

    

  
    

      12
      
      -
      

    

  
    

      
      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
      +
      
- **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).

    

  
    

      
      10
      +
      

    

  
    

      
      11
      +
      
- **A subrepo at its pinned state is unmodified on any bookmark (#147).** A subrepo whose heads were exactly its pin's but which sat on another bookmark than the pin named counted as modified, so `oxy bookmark switch` refused ("the working copy has changes"). Only the state counts now: the same repository at the same heads, or the same Git commit; the recorded pin stands.

    

  
    

      
      12
      +
      

    

  
    

      13
      13
       
      
- **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.

    

  
    

      14
      14
       
      

    

  
    

      15
      15
       
      
>>>>>>> oxy conflict 1 of 1 end

    

  
    

      
      
      …
      
286 unchanged lines