GitHub topics: merge-conflicts
mhagger/git-imerge
Incremental merge for git
Language: Python - Size: 696 KB - Last synced at: 4 days ago - Pushed at: 10 months ago - Stars: 2,739 - Forks: 127
ghuntley/rizzler
rizzler: stop crying over Git merge conflicts and let AI handle the drama
Language: Rust - Size: 3.73 MB - Last synced at: 6 days ago - Pushed at: 24 days ago - Stars: 14 - Forks: 0
truebit/xUnique
merge Xcode project file is so easy
Language: Python - Size: 2.02 MB - Last synced at: 3 days ago - Pushed at: about 1 year ago - Stars: 1,500 - Forks: 121
Mariana-GG/merge_tutorial
Generating merge conflicts and learning to solve them
Size: 5.86 KB - Last synced at: 22 days ago - Pushed at: 22 days ago - Stars: 0 - Forks: 0
olivernybroe/action-conflict-finder
A Github action for finding merge conflicts
Language: Shell - Size: 50.8 KB - Last synced at: 14 days ago - Pushed at: about 2 months ago - Stars: 29 - Forks: 13
AndrewRadev/linediff.vim
A vim plugin to perform diffs on blocks of code
Language: Vim Script - Size: 106 KB - Last synced at: about 2 hours ago - Pushed at: about 1 year ago - Stars: 479 - Forks: 24
balbuf/composer-git-merge-driver
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
Language: PHP - Size: 23.4 KB - Last synced at: 9 days ago - Pushed at: about 2 years ago - Stars: 130 - Forks: 7
skills/resolve-merge-conflicts
Learn why conflicts happen and how to resolve them.
Size: 54.7 KB - Last synced at: about 1 month ago - Pushed at: about 1 year ago - Stars: 168 - Forks: 123
samoshkin/vim-mergetool
:cake: Efficient way of using Vim as a Git mergetool
Language: Vim script - Size: 7.05 MB - Last synced at: about 1 month ago - Pushed at: over 4 years ago - Stars: 297 - Forks: 12
denoerss/git-advanced
This repository is part of my Web Development Bootcamp @ Neue Fische 🐡 – it is focused on advanced Git concepts and includes a session where merge conflicts are intentionally triggered, giving the opportunity to practice resolving complex conflicts and deepen the understanding of Git workflows.
Language: JavaScript - Size: 1.95 KB - Last synced at: about 1 month ago - Pushed at: 5 months ago - Stars: 1 - Forks: 0
jakub-g/git-resolve-conflict
:heavy_dollar_sign: :heavy_plus_sign: :heavy_minus_sign: :white_check_mark: Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
Language: Shell - Size: 34.2 KB - Last synced at: 8 days ago - Pushed at: 4 months ago - Stars: 52 - Forks: 10
purwar1997/git-collaboration
Learning Git features that are used for collaboration
Language: HTML - Size: 8.79 KB - Last synced at: 3 months ago - Pushed at: 3 months ago - Stars: 0 - Forks: 0
magit/magit-imerge
Magit extension for git-imerge
Language: Emacs Lisp - Size: 79.1 KB - Last synced at: 3 months ago - Pushed at: 3 months ago - Stars: 32 - Forks: 4
console-helpers/svn-buddy
Simplified Subversion command-line workflow
Language: PHP - Size: 2.09 MB - Last synced at: about 1 month ago - Pushed at: 4 months ago - Stars: 3 - Forks: 2
emmanseete/skills.resolve-merge-conflicts
Learn why conflicts happen and how to resolve them.
Size: 19.5 KB - Last synced at: about 10 hours ago - Pushed at: 4 months ago - Stars: 0 - Forks: 0
MuhammadZulhusni/Git-Testing
This repo is meant to further strengthen my knowledge of git and help me track changes, try new ideas in branches and collaborate easily.
Size: 15.6 KB - Last synced at: 3 months ago - Pushed at: about 1 year ago - Stars: 0 - Forks: 0
zegervdv/settle.nvim
Settle your merge conflicts from Neovim
Language: Lua - Size: 11.7 KB - Last synced at: 16 minutes ago - Pushed at: almost 3 years ago - Stars: 3 - Forks: 0
errael/splice9
A Vim9.1 plugin for managing three-way merges; pure vim9script.
Language: Vim Script - Size: 1.01 MB - Last synced at: 9 months ago - Pushed at: 9 months ago - Stars: 12 - Forks: 0
smashwilson/merge-conflicts 📦
Resolve git merge conflicts in Atom
Language: CoffeeScript - Size: 5.26 MB - Last synced at: 6 days ago - Pushed at: about 8 years ago - Stars: 431 - Forks: 39
SolangeUG/merge-conflict
Language: HTML - Size: 1.25 MB - Last synced at: about 2 months ago - Pushed at: 7 months ago - Stars: 1 - Forks: 0
CodyTseng/auto-comment-merge-conflicts
Github Action to automatically add a comment (and a label) to alert developers when there are merge conflicts
Language: TypeScript - Size: 884 KB - Last synced at: 18 days ago - Pushed at: about 1 year ago - Stars: 4 - Forks: 1
neninja/exemplo_vim-merge-conflict
Demonstração da resolução de conflitos git com Vim/Neovim
Size: 34.2 KB - Last synced at: about 1 year ago - Pushed at: about 1 year ago - Stars: 0 - Forks: 0
blueworld-gmbh/postbox
📬A tool to split up a Postman collection into files. One file per request.
Language: TypeScript - Size: 13.7 KB - Last synced at: 7 days ago - Pushed at: almost 6 years ago - Stars: 6 - Forks: 1
tonyg/revctrl.org
An extract, as complete as I can make it, of content from the revctrl.org wiki
Language: Python - Size: 2.2 MB - Last synced at: about 1 month ago - Pushed at: over 3 years ago - Stars: 21 - Forks: 6
ZairBulos/skills-resolve-merge-conflicts
@skills "Resolve merge conflicts"
Size: 18.6 KB - Last synced at: 3 months ago - Pushed at: over 1 year ago - Stars: 0 - Forks: 0
EPICLab/ICSME17-MergeConflicts
ICSME 2017 technical paper "Software Practitioner Perspectives on Merge Conflicts and Resolutions" (Accepted)
Language: TeX - Size: 922 KB - Last synced at: about 1 year ago - Pushed at: almost 7 years ago - Stars: 0 - Forks: 0
EPICLab/EMSE19-MergeConflicts
EMSE journal paper "The Life-Cycle of Merge Conflicts: Processes, Barriers, and Strategies" (Accepted)
Language: HTML - Size: 2.46 MB - Last synced at: about 1 year ago - Pushed at: over 6 years ago - Stars: 0 - Forks: 0
liaojinxing/ConflictResolver
An Xcode Source Editor Extension that helps resolving merge conflicts. There are three options, namely 'Accept theirs', 'Accept Yours', and 'Keep Both'. Only one click and it will make the change for you automatically.
Language: Swift - Size: 28 MB - Last synced at: about 1 year ago - Pushed at: about 7 years ago - Stars: 25 - Forks: 1
limanic/kak-git-conflict
A tool for fast resolving merge conflicts for kakoune
Language: KakouneScript - Size: 800 KB - Last synced at: over 1 year ago - Pushed at: over 1 year ago - Stars: 0 - Forks: 0
thufv/automerge
Resolve conflicts via version space algebra in structured merge.
Language: Java - Size: 14.8 MB - Last synced at: about 1 year ago - Pushed at: over 6 years ago - Stars: 7 - Forks: 2
Chaos-Camp/code-drift-challenge-python
Code Challenge: dealing with projects that suffer from code drift
Language: Python - Size: 6.84 KB - Last synced at: about 1 year ago - Pushed at: over 1 year ago - Stars: 0 - Forks: 0
mahammad-mostafa/git-flow-conflict-exercise
This is the sixth project in the second module in the Microverse program. It is an exercise for practicing Git merge conflicts with GitFlow workflow.
Size: 9.77 KB - Last synced at: 7 months ago - Pushed at: almost 2 years ago - Stars: 0 - Forks: 0
formidablae/merge-conflicts
Language: HTML - Size: 1.15 MB - Last synced at: about 1 year ago - Pushed at: over 3 years ago - Stars: 6 - Forks: 0
ishansaksena/Conflerge
Resolving conflict merges with ASTs
Language: Java - Size: 3.62 MB - Last synced at: about 2 years ago - Pushed at: about 8 years ago - Stars: 2 - Forks: 1
pprice/vscode-better-merge 📦
Better merge conflict support for vscode
Language: TypeScript - Size: 605 KB - Last synced at: about 2 years ago - Pushed at: over 7 years ago - Stars: 45 - Forks: 7
MBadriNarayanan/VersionControlWithGit 📦
Course offered by Atlassian and Coursera. Taught by Steve Byrnes.
Size: 195 KB - Last synced at: about 2 years ago - Pushed at: almost 5 years ago - Stars: 0 - Forks: 0
fnogcps/merge-conflicts 📦
:octocat: Merge conflicts are a normal part of working in Git. Learn why they happen and how to resolve them with ease.
Language: HTML - Size: 1.16 MB - Last synced at: about 2 years ago - Pushed at: over 3 years ago - Stars: 0 - Forks: 0
marckassay/DemoOfGitConflicts
Replicates by automation the following three Git conflicts: 'content', 'add/add' and 'modify/delete'.
Language: PowerShell - Size: 78.1 KB - Last synced at: 2 months ago - Pushed at: about 7 years ago - Stars: 1 - Forks: 0
ualberta-smr/merganser
Merganser is a scalable and extendable tool for analyzing merge scenarios in git repositories
Language: Python - Size: 11.4 MB - Last synced at: about 2 years ago - Pushed at: about 4 years ago - Stars: 7 - Forks: 1
KidBourbon/resolve-merge-conflicts-course
Course about learning why conflicts happen and how to resolve them.
Size: 12.7 KB - Last synced at: almost 2 years ago - Pushed at: almost 3 years ago - Stars: 0 - Forks: 0
pg8wood/changelog-generator
Curbing Cumbersome Changelog Conflicts.
Language: Swift - Size: 107 KB - Last synced at: 5 days ago - Pushed at: about 2 years ago - Stars: 2 - Forks: 0
vishaln15/Version-control-with-git
This repository contains materials for the final peer-review project/assignment. Course Instructor Steve Byrnes
Size: 258 KB - Last synced at: about 2 years ago - Pushed at: over 4 years ago - Stars: 2 - Forks: 0
McCambley/test-repo
This repository is meant to demonstrate how merge conflicts may arise on group projects and how we can go about fixing them
Language: HTML - Size: 9.77 KB - Last synced at: about 2 years ago - Pushed at: almost 4 years ago - Stars: 0 - Forks: 0
bioneos/genetics-demo
This collection of genetics demo projects makes up the first module of the Bio::Neos training plan for new employees. The purpose of the module is to understand the company Git workflow and practice using it while collaborating with others.
Language: JavaScript - Size: 1.08 MB - Last synced at: over 1 year ago - Pushed at: over 2 years ago - Stars: 0 - Forks: 0
sophilabs/gilp-merge-conflict
Gilp plugin to detect merge conflicts.
Language: JavaScript - Size: 1.29 MB - Last synced at: 9 days ago - Pushed at: over 2 years ago - Stars: 4 - Forks: 0
danglotb/conflict-merge-solver
Language: Java - Size: 27.3 KB - Last synced at: 4 days ago - Pushed at: over 7 years ago - Stars: 2 - Forks: 0
