jQuery-Merge-for-php-diff - A client side merge tool for Chris Boultons PHP DIFF

  •        8

THIS IS A BETA RELEASE! I had not the time to test this very much so if you rely on this script blindly you may get some unexpected results. You may help me write some tests to be able to check things better. This tool requires a side-by-side or inline diff from php-diff and the full content of the compared files as a line-by-line array.

https://github.com/Xiphe/jQuery-Merge-for-php-diff

Tags
Implementation
License
Platform

   




Related Projects

merge-conflicts - Resolve git merge conflicts in Atom

  •    CoffeeScript

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.

Mergely - Web Application to View and Merge Changes in Documents

  •    Javascript

Mergely is a web application to view and merge changes in documents. Mergely shows you changes to documents side-by-side so you can clearly see what changed from one version to the next. It can be used as a diff tool (read-only) or as both a diff and merge tool for plain text, CSS, HTML, XML, javascript, PHP, C, C++, etc.

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.

Meld - Visual Diff and Merge Tool

  •    Python

Meld is a gnome2 diff and merge tool with pluggable support for version control systems such as cvs, subversion, bzr, darcs, mercurial, monotone, tla. Meld helps you review code changes and understand patches.

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.


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.

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.

nbdime - Tools for diffing and merging of Jupyter notebooks.

  •    Python

nbdime provides tools for diffing and merging of Jupyter Notebooks. See the installation docs for more installation details and development installation instructions.

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.

Ankhsvn

  •    CSharp

AnkhSVN is a Subversion Source Control Provider for Microsoft Visual Studio 2005, 2008 and 2010. AnkhSVN provides source code management support to all project types supported by Visual Studio and allows you to perform the most common version control operations directly from inside the Microsoft Visual Studio IDE.

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.

SCD Merge Wizard

  •    

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

Diff shell extension

  •    C

Diff-ext is an extension for filemanagers such as Windows Explorer and Nautilus that allows to launch diff/merge tools on selected files.

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

diff-pdf - A simple tool for visually comparing two PDF files

  •    M4

Note: this repository is provided as-is and the code is not being actively developed. If you wish to improve it, that's greatly appreciated: please make the changes and submit a pull request, I'll gladly merge it or help you out with finishing it. However, please do not expect any kind of support, including implementation of feature requests or fixes. If you're not a developer and/or willing to get your hands dirty, this tool is probably not for you. diff-pdf is a tool for visually comparing two PDFs.

daff - align and compare tables

  •    Java

This is a library for comparing tables, producing a summary of their differences, and using such a summary as a patch file. It is optimized for comparing tables that share a common origin, in other words multiple versions of the "same" table.

diff-ext

  •    

Diff-ext is Windows Explorer context menu extension that allows to launch diff/merge tools on selected files.

PDF Merger for PHP

  •    PHP

PDF Merger for PHP makes it incredibly easy to merge multiple PDFs together in your PHP web application. After merging you can either output to the browser, prompt a download, save it to a file location or return it as a string.

json-diff - Structural diff for JSON files

  •    CoffeeScript

This project is maintained thanks to your contributions! Please send pull requests. I will merge any pull request that adds something useful, does not break existing things, has reasonable code quality and provides/updates tests where appropriate.

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.