Automerge fails for two divergent notebook with the same base

[jupyter]

Automerge fails for two divergent notebook with the same base

[martinal]

Thanks a lot for a very useful small test case. I've fixed a couple of issues with the autoresolution based on this. A question for you: what would your expectation be for the merge result of the first cell here? The source code (print(1+3)) is unchanged in A but the transients (execution count and output) change, while the cell is deleted in B. If transients are ignored, a natural result is to delete the cell. If the transients are considered as important data, it must be presented to the user for resolution. We might need options to configure the importance of output changes.

[martinal]

Note that if you run nbmerge now, the output is a valid notebook with the unresolved conflicts stored in the metadata. This is a temporary stage, the mergetool for conflict resolution is work in progress.

[eco32i]

I stumbled upon this while trying to merge two notebooks with real life analyses and then reduced it to what I thought was a minimal test case. From the original notebooks I'd say I want to keep both but this may not be the desired course of action in all cases. May be leaving it up to user to handle is not a bad idea.

[martinal]

This use case currently fails on missing handling of execution count conflict in the mergetool.

[martinal]

Deleting all output here and trying merge results in first cell not checked for deletion in merge gui.