Efficiently resolving composer.lock merge conflicts

This page summarizes the projects mentioned and recommended in the original post on dev.to
Composer Git composer-json git-merge git-merger

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
SaaSHub - Software Alternatives and Reviews
SaaSHub helps you find the best software and product alternatives
www.saashub.com
featured

  • composer-git-merge-driver

    Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files

    • Since above methods will not preserve the locked versions on packages that have been added on your feature branch, you may use an external tool such as Composer Git Merge Driver that automates this process, keeping your locked versions and minimizing the diff produced. Please refer to the official repository for installation and usage instructions.

  • 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.

    InfluxDB logo
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

  • Should I use Git submodules?

    2 projects | /r/git | 12 Mar 2021

  • Grace Version Control System

    4 projects | news.ycombinator.com | 6 May 2024

  • Rudolfs – high-performance caching Git LFS server with AWS S3 and local back end

    1 project | news.ycombinator.com | 10 May 2024

  • Dicas e configurações para seu sistema linux

    4 projects | dev.to | 10 May 2024

  • Show HN: Tegon: AI-first, open source alternative to Jira, Linear

    3 projects | news.ycombinator.com | 7 May 2024