Martin Sandve Alnæs
Martin Sandve Alnæs
If you add a breakpoint or print in the make_inline_attachments_decisions function you'll see that it's not called. That's the root cause and why I wrote this issue as I did....
In the _current_ implementation a delete/patch conflict on an attachment will not be visible, since the modified attachment will be the new value. I'm all ears on ways to display...
Maybe if we apply strategies in the generic merge, we can create an inline decision right away without splitting up the diffs there into multiple decisions that need bundling later....
However, I don't see any way to preserve both local and remote modifications as inline conflicts in the merged notebook without storing them under different names. One approach could be...
Still an issue although the problem is elsewhere.
An implementation of json patch conversion is available as ``` json_patch_obj = nbdime.diff_format.to_json_patch(nbdime_diff_obj) ``` However I'm not sure what the correct way is to insert multiple values before the same...
It's not the verbosity I have problems with, it's what the index in the path refers to. The path /3 here refers to index 3 of the intermediate json object...
Really, I don't understand the utility of this model... If you want to see which cells have been modified, which lines have been modified, etc., then the indices in the...
I believe to_json_patch is now working, however the unit test is extremely short!
Thanks for the fast response. What are the reasons for keeping the sys modifications? Is it only to allow the ```__name__ == "__main__"``` notation or is there something else as...