Performing a merge operation when both branches have changed the same cardinality=many relationship and added peers results to an incomplete merge operation where the added peer from the other branch (i.e. not main) is missing.
Expected Behavior
If peers are added on both branches both of them should show up.
Steps to Reproduce
Start a fresh instance of infrahub
Create three tags: initial, main and branch1
Create an organisation called "my-org" and tie it to the initial tag.
Create a new branch called branch1
Add the branch1 tag to "my-org" in branch1
Switch to the main branch
Add the main tag to the "my-org" organisation
Merge branch1 into main
View the tags on "my-org", only initial and main shows up even though we expected initial, main and branch1 to be there.
dgarros
commented
1 year ago
Component
API Server / GraphQL
Current Behavior
Performing a merge operation when both branches have changed the same cardinality=many relationship and added peers results to an incomplete merge operation where the added peer from the other branch (i.e. not main) is missing.
Expected Behavior
If peers are added on both branches both of them should show up.
Steps to Reproduce
initial,mainandbranch1initialtag.branch1branch1tag to "my-org" in branch1maintag to the "my-org" organisationbranch1into maininitialandmainshows up even though we expectedinitial,mainandbranch1to be there.Additional Information
No response