Top 4 merge-conflict Open-Source Projects

• git-imerge

  12 2,665 0.0 Python

  Incremental merge for git

Project mention: Dealing with Diverged Git Branches | news.ycombinator.com | 2024-02-01

• linediff.vim

  2 449 2.7 Vim Script

  A vim plugin to perform diffs on blocks of code

• InfluxDB

  www.influxdata.com featured

  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.

  

• vim-mergetool

  6 281 0.0 Vim Script

  :cake: Efficient way of using Vim as a Git mergetool

• composer-git-merge-driver

  1 120 0.0 PHP

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

merge-conflicts 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

• Question: Looking to write text from a buffer into a section of another buffer on `BufLeave` or `BufWriteCmd` without saving.

  3 projects | /r/neovim | 19 Jan 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

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

  2 projects | /r/git | 24 Aug 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
• A note from our sponsor - InfluxDB
  www.influxdata.com | 8 May 2024

  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. Learn more →

Index

Sponsored

SaaSHub - Software Alternatives and Reviews

SaaSHub helps you find the best software and product alternatives

www.saashub.com