What is the best way to undertake a heavyweight merge (dozens of files)?

This page summarizes the projects mentioned and recommended in the original post on /r/git
Git Python merge-conflicts

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

  • git-imerge

    Incremental merge for git

    • If the merge is large in the number of commits involved git imerge may be useful to you. It breaks down one big merge into many smaller merges, essentially merging one new commit from each branch, one at a time. The advantage being that you only ever need to consider the conflict between two individual commits at a time.

  • 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

  • Dealing with Diverged Git Branches

    1 project | news.ycombinator.com | 1 Feb 2024

  • Save rebase progress and attempt to cherry-pick?

    1 project | /r/git | 6 Feb 2023

  • I have a feature branch that is now way behind it's remote parent. How do I make this work?

    1 project | /r/git | 18 Oct 2022

  • Git-imerge: Incremental merge for Git

    1 project | news.ycombinator.com | 11 Jul 2022

  • strategy to update 2yo feature branch off of develop

    1 project | /r/git | 8 Jun 2022