Awesome Open Source

Programming Languages

Search results for git merge conflicts

merge-conflicts x

23 search results found

Git Imerge ⭐ 2,573

Incremental merge for git

Vim Merginal ⭐ 268

Fugitive extension to manage and merge Git branches

Vim Mergetool ⭐ 131

🍰 Efficient way of using Vim as a Git mergetool

Resolve Merge Conflicts ⭐ 106

Learn why conflicts happen and how to resolve them.

Git Json Merge ⭐ 86

A git merge driver that use xdiff to automatically resolve merge conflicts in json files. This project was inspired by git-po-merge.

Composer Git Merge Driver ⭐ 61

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

Mylearningnotes ⭐ 58

Because its never late to start taking notes and 'public' it...

Git Resolve Conflict ⭐ 42

💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)

Staruml.teamwork ⭐ 28

Magit Imerge ⭐ 27

Magit extension for git-imerge

Php Merge ⭐ 24

Php library to merge text. 3 way merge like git in php.

Git Hooks ⭐ 17

Useful Git Hooks for .NET Projects

Git Guide For Beginners ⭐ 17

A guide containing all the commands required to contribute to open source.

Changelog Sh ⭐ 14

A tool to keep a changelog without conflicts

Blockbuster ⭐ 13

VCR cassette manager

A Git GUI for JSBox, based on isomorphic-git

Git Groups - Manage multiple repositories as a single project

Git Topics ⭐ 8

A collection of git commands to manage independent topic branches

Crio Launch Getstarted Guide ⭐ 7

Crio Launch Get Started Guide

Conflict is a small esoteric language giving semantics to git merge conflicts

Git Workflow Merge Conflicts Lab ⭐ 5

Team 1418's Git(Hub) test. Must be passed to gain access to the team GitHub organization.

Related Searches

Javascript Git (5,021)

Shell Git (4,715)

Git Commit (4,624)

Python Git (4,503)

Html Git (2,538)

Ruby Git (2,519)

Java Git (1,787)

Command Line Git (1,757)

Golang Git (1,520)

Php Git (1,428)

1-23 of 23 search results

Privacy | About | Terms | Follow Us On Twitter

Copyright 2018-2024 Awesome Open Source. All rights reserved.