binaryninja-api icon indicating copy to clipboard operation
binaryninja-api copied to clipboard
verified publisher icon Vector35

Make merge conflicts occur on core objects rather than JSON blobs

Open fuzyll opened this issue 1 year ago • 0 comments

Right now, we perform merge conflicts on JSON blobs pulled directly out of the snapshot we're merging from. This has a whole host of limitations associated with it, including:

  • #5721
  • #5722
  • #5723
  • #5724

We should instead make merge conflicts occur on core objects (falling back to JSON when necessary) so that our merge conflicts can be improved.

fuzyll avatar Jul 11 '24 18:07 fuzyll