MergeNB: An intuitive merge conflict resolver built for Jupyter notebooks in VS Code [P]

Reddit r/MachineLearning Tools
merge-conflict jupyter-notebooks vs-code-extension git collaboration developer-tool

Summary

MergeNB is a VS Code extension that provides an intuitive merge conflict resolver for Jupyter notebooks, aiming to improve upon nbdime's bugginess in collaborative research settings.

I used to work heavily with Jupyter Notebooks + git + VS Code in a collaborative research setting and found nbdime to be somewhat buggy/a hassle to work with in general. So, in typical side project fashion ([relevant xkcd](https://xkcd.com/1319/)) I've been working on MergeNB quite a bit over the last 6 months or so. It's (currently only) a VS Code extension with a web UI, and has a few cool improvements over other alternatives, which I outlined in the README/docs site. I'd be over the moon if this actually gets used by people, and would love a star if it's interesting. See [https://github.com/Avni2000/MergeNB](http://github.com/Avni2000/MergeNB). I've also been working on a static documentation site here: [https://avni2000.github.io/MergeNB/docs](https://avni2000.github.io/MergeNB/docs) I'm planning on working on it a lot more over the summer and properly fleshing out a few of the ideas I had (including making it a git mergetool as well as a VS Code extension), so if you'd like to contribute, feel free to raise an issue or shoot me a message/email :)
Original Article

Similar Articles

Merge

Product Hunt

Merge offers AI-native code review assessments, presented as a product on Product Hunt.

Weave: Merging based on language structure and not lines

Hacker News Top

Weave is an entity-level semantic merge driver for Git that resolves conflicts by parsing code with tree-sitter, merging functions and classes instead of lines. It supports 28 languages and offers additional coordination and MCP server features for multi-agent workflows.

The Object Model in Livelymerge

Lobsters Hottest

A research notebook from Ink & Switch describing the object model for Livelymerge, a project that uses an Automerge document as the persistent, collaborative heap of a JavaScript program.

lfnovo/open-notebook

GitHub Trending (daily)

An open-source implementation of Google's NotebookLM with additional flexibility and features, allowing users to self-host and customize the notebook AI experience.

Bayesian Model Merging

arXiv cs.LG

Introduces Bayesian Model Merging (BMM), a plug-and-play bi-level optimization framework for combining multiple task-specific experts into a single model, achieving state-of-the-art performance on vision and language benchmarks.