Resolving Git conflicts in package-lock.json using a merge driver

This page summarizes the projects mentioned and recommended in the original post on dev.to
Package Managers Yarn Npm package-manager JavaScript

SurveyJS - Open-Source JSON Form Builder to Create Dynamic Forms Right in Your App
With SurveyJS form UI libraries, you can build and style forms in a fully-integrated drag & drop form builder, render them in your JS app, and store form submission data in any backend, inc. PHP, ASP.NET Core, and Node.js.
surveyjs.io
featured
InfluxDB - Power Real-Time Data Analytics at Scale
Get real-time insights from all types of time series data with InfluxDB. Ingest, query, and analyze billions of data points in real-time with unbounded cardinality.
www.influxdata.com
featured

  • npm-merge-driver

    Discontinued git merge driver for resolving conflicts in npm-related files

    • The npm team has created an npm-merge-drive which makes a smarter merge than our previous driver - which does an overwrite 😁, keeping the lock file in sync with our changes in the package.json. You can just install it globally in your machine without affecting your coworkers because the ~/.config/git/attributes is used for all your cloned repositories.

  • git-json-merge

    A git merge driver that use xdiff to automatically resolve merge conflicts in json files. This project was inspired by git-po-merge.

    • You can find other merge drivers in the npm registry, even for other types of files like the git-json-merge.

  • SurveyJS

    Open-Source JSON Form Builder to Create Dynamic Forms Right in Your App. With SurveyJS form UI libraries, you can build and style forms in a fully-integrated drag & drop form builder, render them in your JS app, and store form submission data in any backend, inc. PHP, ASP.NET Core, and Node.js.

    SurveyJS logo

  • yarn

    The 1.x line is frozen - features and bugfixes now happen on https://github.com/yarnpkg/berry

    • There are long discussions about handling these large files as binaries. Git compresses all the changes so the size of your repo won't be compromised with a binary package-lock.json file. It's up to you.

NOTE: The number of mentions on this list indicates mentions on common posts plus user suggested alternatives. Hence, a higher number means a more popular project.

Suggest a related project

Related posts

  • Set up your own LMQL environment.

    3 projects | /r/LocalLLaMA | 7 Dec 2023

  • Lockfile merge conflicts, how to handle it correctly?

    3 projects | dev.to | 14 Jul 2023

  • Yarn Install Broken

    1 project | /r/node | 15 Apr 2023

  • Benchmarks of JavaScript Package Managers

    1 project | news.ycombinator.com | 28 Feb 2023

  • Switching back to Windows showed me why Linux is more viable than ever

    3 projects | /r/linux | 6 Oct 2022