We need to update our logic for merging two branches to work with the new internal data structures for diffs added in #3280.
See BranchMerger.merge_graph for how things currently work. I think the new version can probably be much simpler as nodes and relationships are stored in the same data structure now.
Describe the Use Case
We need to be able to merge two branches together.
Component
API Server / GraphQL
Describe the Feature Request
We need to update our logic for merging two branches to work with the new internal data structures for diffs added in #3280. See
BranchMerger.merge_graph
for how things currently work. I think the new version can probably be much simpler as nodes and relationships are stored in the same data structure now.Describe the Use Case
We need to be able to merge two branches together.
Additional Information
No response