Python merge-conflict 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

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.

NOTE: The open source projects on this list are ordered by number of github stars. The number of mentions indicates repo mentiontions in the last 12 Months or since we started tracking (Dec 2020).

Python 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
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
interactive merge in git

1 project | /r/git | 18 May 2022
A note from our sponsor - InfluxDB
www.influxdata.com | 1 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 →