Impossible to use nbdime with remote within a google cloud instance

[sergiocalde94]

Hi! I am using your powerful tool, thank you very much for developing ❤️

I am having a lot of troubles with diff and merging notebooks, maybe I am doing something bad.

I have a notebook, let's name it test.ipynb for this issue. I am working in the same branch with other mate and we are having conflicts wen we try to merge them, so I suggest to use nbdime.

The problem is that I can only perform nbdiff-web test.ipynb -p 8791 -b none between my local file (without commit nothing yet) and my branch. If I try to commit my file and add remote file with nbdiff-web test.ipynb test.ipynb -p 8791 -b none (names are the same because is the same file), the tool gives me no differences between the files, which is no true :(

This is probably my fault and I am not using the tool in the correct way, can you help me how to compare a local already commited file and the remote one? (for merge I have the same problem, "there is no differences between the files).

Thank you in advice and sorry if this is an unusful question.

[bolliger32]

I believe you just need to provide the names of the two branches. For instance, nbdiff-web branch1_name branch2_name test.ipynb will show you the diffs using branch1_name as the base. You can omit one of the branch names, but then the other branch will serve as the base. For example: nbdiff-web branch2_name test.ipynb will show you the diffs between your local copy and the copy contained in branch2_name, but it will look use branch2_name as the base rather than the remote.

One further note: If the branches you have are remote branches, don't forget to use remotes/origin/branch_name (or whatever your git remote is called) rather than just branch_name

[sergiocalde94]

Thank you very much @bolliger32 your help was incredible and now I can show nbdiff-web between base branches and remotes but I have still a problem with nbmerge-web :(

This is working: nbdiff-web branch_name remotes/origin/branch_name notebook.ipynb -p 8791 -b none Thist is not working: nbmerge-web branch_name remotes/origin/branch_name notebook.ipynb -p 8791 -b none

Any help for my merge issue.

Thank you in advise 💯