Awesome Open Source

Programming Languages

Search results for merge conflict resolution

conflict-resolution x

7 search results found

Merge Conflicts ⭐ 442

Resolve git merge conflicts in Atom

Git Resolve Conflict ⭐ 42

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

Reconcile.js ⭐ 40

Simple reconciliation, diff and merge for the DOM inspired by Facebook's React Reconcilation Algorithm

Automergetool ⭐ 38

Half automatic merge toolchain for git

Conflictresolver ⭐ 24

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.

syntactic merge tool for java

a declarative tool for creating integration branches in git

Related Searches

Javascript Merge (1,085)

Python Merge (765)

Git Merge (734)

Commit Merge (476)

Java Merge (363)

Shell Merge (277)

Pull Requests Merge (236)

Plugin Merge (156)

Swift Merge (54)

Editor Merge (32)

1-7 of 7 search results

Privacy | About | Terms | Follow Us On Twitter

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