jupyterlab-gitplus VS delta

If you are in need of a diff tool for jupter notebooks use https://www.reviewnb.com/ and for word documents use https://www.simuldocs.com/

- GitHub PR code reviews with ReviewNB[4]

Alternatively, if you don't care about cell outputs then Jupytext[5]

Disclaimer: I built ReviewNB. It's a completely bootstrapped business, 5 years in the making and now used by leading DS teams at Meta, AWS, NASA JPL, AirBnB, Lyft, Affirm, AMD, Microsoft & more (https://www.reviewnb.com/#customers)

[1] https://github.com/jupyterlab/jupyterlab-git

Already a GitHub plugin that does this very nicely: ReviewNB

For version control: https://www.reviewnb.com/ helps. Agree with the rest but some experimental notebooks are useful to track/version control.

It's not focused on collaboration, but it does add some critical pieces that otherwise make Jupyter development frustrating when working with a team. Specifically: `nbdev_prepare` ensures that diffs are as small as possible, by removing and standardising notebook metadata; and `nbdev_fix` fixes merge conflicts so that they are cell-level, rather than line level, so they can be opened and fixed in notebooks.

Something else we've found helpful for collaboration (not associated - just happy users) is this: https://www.reviewnb.com/ . It means we can get a nice notebook-based PR workflow.

Real-time collaboration is available in Jupyter nowadays: https://jupyterlab.readthedocs.io/en/stable/user/rtc.html . nbdev doesn't have any extra functionality for it, however -- but it should work fine in this environment.

Thanks for the difftastic & zoxide tips.

However, I've been using this git pager/difftool: https://github.com/dandavison/delta

While it's not structural like difft, it does produce more readable output for me (at least when scrolling fast through git log -p /scanning quickly

View on GitHub

I'm currently waiting on the integration between Delta and Difftastic:

https://github.com/dandavison/delta/issues/535

Difftastic now has JSON output, whic should make it much easier to build this.

I'm surely in the minority here. I've been using Emacs for almost a decade now, but I just can't get into the Magit workflow. I've tried several times, but always end up going back to Git on the command line. I have dozens of aliases, shell integrations, a nice diff viewer[1], etc., and interacting with Git has become muscle memory. I can commit, cherry-pick, rebase, bisect, fix conflicts, etc., in a fraction of the time it would take me to navigate Magit's UI. I'm sure with enough practice, a Magit user could do this more quickly and efficiently, but honestly, with some custom-built porcelain, Git's UI is not so bad. Though this could very well be Stockholm syndrome after using it for such a long time...

For whatever reason, Magit's opinionated workflows never clicked with me. A part of it is the concern that it will do something weird to my repo that I'll then have to waste more time undoing manually. I usually don't trust sugary wrappers around tools. And another is the fact I don't use Emacs on all machines, and setting up Git on a remote system is just a matter of copying over my config and some shell integrations.

Also, on a more personal note, I find the cultish fanboyism whenever Magit is brought up slightly offputting. Does anyone have anything bad to say about it? No software can realistically be this infallible. :)

[1]: https://github.com/dandavison/delta

For looking at diffs I still prefer the command line though, and use delta to view diffs between commits or branches.