merge-conflicts - Resolve git merge conflicts in Atom

  •        46

This package detects the conflict markers left by git merge and overlays a set of controls for resolving each and navigating among them. Additionally, it displays your progress through a merge.

https://atom.io/packages/merge-conflicts
https://github.com/smashwilson/merge-conflicts

Dependencies:

space-pen : ^5.0.1
underscore-plus : 1.x

Tags
Implementation
License
Platform

   




Related Projects

git-imerge - Incremental merge for git

  •    Python

Perform a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution. I think that it is easiest to understand the concept of incremental merging visually, and therefore I recommend the video of my git-imerge presentation from the GitMerge 2013 conference (20 min) as a good place to start. The full slides for that talk are available in this repository under doc/presentations/GitMerge-2013. At the same conference, I was interviewed about git-imerge by Thomas Ferris Nicolaisen for his GitMinutes Podcast #12.

mergepbx - script for merging XCode project files in git

  •    Python

Tracking a Xcode project in a version control system is annoying. Simply adding files can lead to merge conflicts that have to be solved manually, although it would be possible to resolve the conflict automatically, if the merge algorithm would be aware of the structure of Xcode's project file. After long and annoying merge sessions in one of my projects, I came to the conclusion, that writing a merge driver for git which understands the structure of the project file would be a worthwhile endeavour, as it would save me from solving the merge conflicts for my co-workers.

git-journal - The Git Commit Message and Changelog Generation Framework :book:

  •    Rust

Maintaining changelogs can be time-consuming, especially when multiple persons work on the same project. If you maintain a separate file, merge conflicts and additional release work is sure to follow. Sometimes complete entries are lost during merge conflict resolution, people forget to mention something or links between issues and actual commits are missing.

conflict

  •    Ruby

Conflict allows developers to quot;fail fastquot; by detecting merge conflicts in real time.

meld - Compare files, directories and working copies

  •    Python

Meld is a visual diff and merge tool targeted at developers. Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and supports many version control systems including Git, Mercurial, Bazaar and Subversion. Meld helps you review code changes, understand patches, and makes enormous merge conflicts slightly less painful.


fac - Easy-to-use CUI for fixing git conflicts

  •    Go

I never really liked any of the mergetools out there so I made a program that is somewhat easier to use. fac operates much like git add -p . It has a prompt input at the bottom of the screen where the user inputs various commands.

CVS Conflict Editor

  •    C++

CVS Conflict Editor is the must have companion to CVS and WinCVS. No more scrolling down chasing for conflict markers in your files, CVS Conflict Editor does it for you. You can edit your file to solve the conflicts in place, or use the conflict solving

ui-select - AngularJS-native version of Select2 and Selectize

  •    Javascript

For the roadmap, check issue #3 and the Wiki page.When issuing a pull request, please exclude changes from the "dist" folder to avoid merge conflicts.

git-fire - :fire: Save Your Code in an Emergency

  •    Shell

git-fire is a Git plugin that helps in the event of an emergency by switching to the repository's root directory, adding all current files, committing, and pushing commits and all stashes to a new branch (to prevent merge conflicts). Alias it to git out or git going for comedic effect.

Subversion

  •    C

Subversion is an open source version control system. Founded in 2000 by CollabNet, Inc., the Subversion project and software have seen incredible success over the past decade. The open source community has used Subversion widely: for example in projects such as Apache Software Foundation, Free Pascal, FreeBSD, GCC, Django, Ruby, Mono, SourceForge, ExtJS, Tigris.org, PHP and MediaWiki. Google Code also provides Subversion hosting for their open source projects.

webpack-merge - Merge designed for Webpack (MIT)

  •    Javascript

webpack-merge provides a merge function that concatenates arrays and merges objects creating a new object. If functions are encountered, it will execute them, run the results through the algorithm, and then wrap the returned values within a function again. This behavior is particularly useful in configuring webpack although it has uses beyond it. Whenever you need to merge configuration objects, webpack-merge can come in handy.

tslint-config-prettier - Use tslint with prettier without any conflict

  •    TypeScript

Do you want to use TSLint and Prettier without conflicts? tslint-config-prettier disables all conflicting rules that may cause such problems. Prettier takes care of the formatting whereas tslint takes care of all the other things. Check how it works in this tutorial.

SCD Merge Wizard

  •    

SCD Merge Wizard will help you generate query script for Slowly Changing Dimension (SCD) transformations using Microsoft's TSQL Merge statement.

Advanced Mail Merge (AMM) for Microsoft Office

  •    

Advanced Mail Merge for Microsoft Word 2007/2010, offers great extensable functionality: - Merge to document (PDF) - Merge to attachment - Use Outlook to send e-mail - Optional, leverage Microsoft Dynamics CRM for tracking

composer-merge-plugin - Merge one or more additional composer.json files at Composer runtime

  •    PHP

Merge multiple composer.json files at Composer runtime.Composer Merge Plugin is intended to allow easier dependency management for applications which ship a composer.json file and expect some deployments to install additional Composer managed libraries. It does this by allowing the application's top level composer.json file to provide a list of optional additional configuration files. When Composer is run it will parse these files and merge their configuration settings into the base configuration. This combined configuration will then be used when downloading additional libraries and generating the autoloader.

FTASync - Allows you to sync CoreData entities with a Parse backend.

  •    Objective-C

Allows you to sync CoreData entities with a Parse backend. FTASync supports relationships (many-to-many have not been tested), conflict resolution (last in wins), custom data class names, and multiple levels of inheritance. For conflict resolution each relationship is in it's own conflict domain, but all entity attributes are currently in a single conflict domain. As with any open source code, do your own due diligence before putting this in a production app! There are a few known issues that still need addressed. They are listed below.

responsive-email - A table-based (but responsive) email template. Has MailChimp merge tags in place.

  •    HTML

Some of the images used within this template are created at double-resolution to give a crisp display on HiDPI screens - please bear in mind this will require extra bandwidth. If you are optimising for lower bandwidths you may want to use standard resolution images instead. Also, images hidden using display: none; do still load, even though they are not displayed. Make sure you link all your images using full URL paths, and upload them to a suitable webspace, or upload/link via your email transmission service.

PDF Merge

  •    CSharp

PDF Merge is a simple user-friendly application that allows you to merge multiple PDF documents including scanned / imported documents and images into 1 PDF.

zsh-histdb - A slightly better history for zsh

  •    Shell

If you want to use it, see the Reverse isearch section below which now covers it. It is also possible to merge multiple history databases together without conflict, so long as all your machines have different hostnames.





We have large collection of open source products. Follow the tags from Tag Cloud >>


Open source products are scattered around the web. Please provide information about the open source projects you own / you use. Add Projects.