Skip to content

Releases: Avni2000/MergeNB

v0.0.6

12 Feb 20:19

Choose a tag to compare

v0.0.6 Pre-release
Pre-release

TL;DR

  • Fix for incoming cells dropping when base == source
  • Metadata merging fixes and edge cases
  • Regression tests

What's Changed

  • [CI] [ENHANCEMENT] Add support for MacOS and VSCode 1.80.0 by @Avni2000 in #77
  • [FEAT] Global Cell matching algorithm by @Avni2000 in #78
  • [FIX] Incoming cells now overwrite instead of dropping by @Avni2000 in #81
  • [FIX] Metadata Holes by @Avni2000 in #83

Full Changelog: 0.0.5...0.0.6

0.0.5

11 Feb 20:11
2880aac

Choose a tag to compare

0.0.5 Pre-release
Pre-release

TL;DR

  • Restores Windows functionality for finding conflicted notebooks
  • Adds Windows to CI
  • Caches dependencies in CI correctly

What's Changed

  • [CI] [FIX] Functionality for Finding Conflicts on Windows by @Avni2000 in #76

Full Changelog: 0.0.4...0.0.5

v0.0.4

11 Feb 05:32

Choose a tag to compare

v0.0.4 Pre-release
Pre-release

TL;DR

  • Undo/Redo Support
  • Performance Improvements
  • Testing Harness Improvements
  • Diff styling improvements

What's Changed

  • [FEAT] Add undo/redo support with history panel by @Copilot in #50
  • chore(deps-dev): bump react-dom and @types/react-dom by @dependabot[bot] in #56
  • chore(deps-dev): bump react and @types/react by @dependabot[bot] in #54
  • chore(deps-dev): bump the dev-dependencies group with 3 updates by @dependabot[bot] in #52
  • ci: bump actions/cache from 4 to 5 by @dependabot[bot] in #61
  • ci: bump actions/setup-node from 4 to 6 by @dependabot[bot] in #60
  • ci: bump actions/checkout from 4 to 6 by @dependabot[bot] in #59
  • [FEAT] Refactor integration test structure and fix CLI functionality by @Avni2000 in #51
  • chore(deps-dev): bump the production-dependencies group across 1 directory with 4 updates by @dependabot[bot] in #62
  • Fix image flickering from ResizeObserver/virtualization feedback loop by @Copilot in #63
  • [FIX] Improve-diffs by @Avni2000 in #65
  • [FIX] Properly pass headless settings to testing framework by @Avni2000 in #67
  • [FIX] Perf improvements by @Avni2000 in #69
  • [FEAT] Virtualize Cell Rows with TanStack and React Callbacks by @Avni2000 in #71
  • [FEAT] Performance improvements + Fix Image Rendering by @Copilot in #66

Full Changelog: 0.0.3...0.0.4

v0.0.3

06 Feb 19:17

Choose a tag to compare

v0.0.3 Pre-release
Pre-release

This is a relatively more mature release of the web port, with bug fixes and full integration tests + harnesses

What's Changed

  • [FIX] Switch to the much lighter KaTeX library by @Avni2000 in #24
  • Optimize WebConflictPanel rendering for large notebooks via virtualization and lazy MathJax by @Copilot in #23
  • [FIX] Rebuild notebook from unified rows + resolved text areas by @Avni2000 in #30
  • Remove webview compatibility layer and unused utilities by @Copilot in #31
  • [FIX] Success Screen fixes by @Avni2000 in #32
  • [FIX] Calculate DOM for virtualization behaviour by @Avni2000 in #33
  • [FEAT] Create a Testing Harness by @Avni2000 in #34
  • Replace Levenshtein-based LCS with snaking algorithm for cell matching by @Copilot in #41
  • [CI] Implement caching for playwright, npm, and vscode by @Avni2000 in #42
  • [ENHANCEMENT] Adds take all current/incoming/base by @Avni2000 in #43
  • [FEAT] Generic Testing Harness + "Take All" tests by @Avni2000 in #44

Full Changelog: 0.0.2...0.0.3

v0.0.2

03 Feb 20:38

Choose a tag to compare

v0.0.2 Pre-release
Pre-release

TL;DR:

Ported to Web, working out the kinks.

What's Changed

  • [Refactor] Sorting logic to create a wrapper for sorting by postion by @Avni2000 in #9
  • chore(deps-dev): bump typescript-eslint from 8.53.1 to 8.54.0 in the production-dependencies group by @dependabot[bot] in #14
  • chore(deps-dev): bump @types/node from 25.0.10 to 25.2.0 in the dev-dependencies group by @dependabot[bot] in #13
  • Remove textual conflict marker support, consolidate to semantic resolution only by @Copilot in #15
  • [MIGRATE] [WEB] Port to Web-based merge resolver by @Avni2000 in #16
  • [FEAT] Optimize WebConflictPanel rendering for large notebooks via virtualization and lazy MathJax

Full Changelog: 0.0.1...0.0.2

v0.0.1

29 Jan 03:08

Choose a tag to compare

v0.0.1 Pre-release
Pre-release

What's Changed

Full Changelog: https://github.com/Avni2000/MergeNB/commits/0.0.1

Writeup is in README