Native Notebooks - Git Merge Conflicts Breaks Notebooks

[claudiaregio]

Steps to reproduce:

1. Create notebook
2. Create merge conflict
3. Save notebook and try to reopen in text editor

Had a quick chat with @rebornix and he believes following nbdime for this solution is a good start

https://nbdime.readthedocs.io/en/latest/cli.html#merging
https://nbdime.readthedocs.io/en/latest/merging.html

[dennisl68-castra]

As far as I know, the ordinary git diff tools only handles plain text and not structured data (well, they do, but they are totally unaware if the result is a legitim structure).

Or maybe gron is a better tool as it handles JSON generically...
jsondiff: diff JSON in Git using gron
Cool json git diff command

[DonJayamanne]

@claudiaregio Are you still running into this issue. If yes please could you create an issue on VS COde repo as jupyter extension doesn't own this feature.

[gro1m]

As far as I know, the ordinary git diff tools only handles plain text and not structured data (well, they do, but they are totally unaware if the result is a legitim structure).

Or maybe gron is a better tool as it handles JSON generically... jsondiff: diff JSON in Git using gron Cool json git diff command

Yeah, but for example a "simple" editor like vim can handle this :)

[vscodenpa]

This feature request is now a candidate for our backlog. The community has 60 days to upvote the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our documentation.

Happy Coding!

[vscodenpa]

This feature request has not yet received the 20 community upvotes it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our documentation.

Happy Coding!

[vscodenpa]

🙁 In the last 60 days, this feature request has received less than 20 community upvotes and we closed it. Still a big Thank You to you for taking the time to create this issue! To learn more about how we handle feature requests, please see our documentation.

Happy Coding!