Search Results for "merge diff"
Sort By:
Showing 31 open source projects for "merge diff"
View related business solutions-
Whether natural disaster, cyberattack, or plain-old human error, data can disappear in the blink of an eye. ConnectWise BCDR (formerly Recover) delivers reliable and secure backup and disaster recovery backed by powerful automation and a 24/7 NOC to get your clients back to work in minutes, not days.
-
Our 360 recognition & rewards platform enables everyone (peer to peer & manager to employees alike) to send meaningful recognition rooted in core values. Nectar has the most extensive rewards catalog so users can choose from company branded swag, Amazon products, gift cards or custom reward types. Integrate with your other tools like Slack and Teams to make sending recognition easy. We support top organizations like MLB, SHRM, Redfin, Heineken and more.
-
1
JSON diff and patch
JSON diff and patch
jd is a command line utility and Go library for diffing and patching JSON and YAML values. It supports a native jd format (similar to a unified format) as well as JSON Merge Patch (RFC 7386) and a subset of JSON Patch (RFC 6902). -
2
JSON for Modern C++
JSON that's part of C++
This is JSON for C++, a JSON library unlike any other that's packed with plenty of great features. While there may be dozens of JSON libraries out there, JSON for C++ stands out with a focus on three things: an intuitive syntax, trivial integration and serious testing. Using the operator magic of modern C++, this library makes JSON feel like a first class data type. With trivial integration, the entire code is made up of a single header file json.hpp, no dependencies, no complex build system... -
3
Pragma-git
Pragma-git is a friendly pragmatic git control app
..., merge, push, pull, tag, stash. History browser, builtin pragma-merge diff and merge tool (external tool may be used instead) Settings, handling repository, branches, remotes, cloning as well as software preferences. Fully git compatible, try it, and use together with other clients. Aiming to be the opposite to how many beginners perceive git. -
4
nbdime
Tools for diffing and merging of Jupyter notebooks
nbdime provides tools for diffing and merging Jupyter notebooks. Jupyter notebooks are useful, rich media documents stored in a plain text JSON format. This format is relatively easy to parse. However, primitive line-based diff and merge tools do not handle well the logical structure of notebook documents. nbdime, on the other hand, provides “content-aware” diffing and merging of Jupyter notebooks. It understands the structure of notebook documents. Therefore, it can make intelligent decisions... -
Built for growing businesses and well-established enterprises alike, Multiview is a highly scalable and robust ERP.
-
5
git-autofixup
Create fixup commits for topic branches
git-autofixup parses hunks of changes in the working directory out of git diff output and uses git blame to assign those hunks to commits in <revision>..HEAD, which will typically represent a topic branch, and then creates fixup commits to be used with git rebase --interactive --autosquash. It is assumed that hunks near changes that were previously committed to the topic branch are related. <revision> defaults to git merge-base --fork-point HEAD @{upstream} || git merge-base HEAD @{upstream... -
6
gh-dash
A beautiful CLI dashboard for GitHub
A GitHub (gh) CLI extension to display a dashboard with pull requests and issues by filters you care about. Write multiple configuration files to easily switch between completely different dashboards. Repo name-to-path mappings can be an exact match (full name, full path) or wildcard matched using the owner and partial path. To override the default set of terminal colors and instead create your own color scheme, you can define one in your config.yml file. If you choose to go this route, you... -
7
GitUp
A Git interface to work quickly and safely
Work quickly, safely, and without headaches. The Git interface you've been missing all your life has finally arrived. GitUp lets you see your entire labyrinth of branches and merges with perfect clarity. Any change you make, large or small, even outside GitUp, is immediately reflected in GitUp's graph. No refreshing, no waiting. Highlight a commit and hit the spacebar to quickly see its message and diff. GitUp gives you full, transparent control over your local checkout, so it's easy to back... -
8
FileTrees.jl
Parallel file processing made easy
Easy everyday parallelism with a file tree abstraction. Read a directory structure as a Julia data structure, (lazy-)load the files, apply map and reduce operations on the data while not exceeding available memory if possible. Make up a file tree in memory, create some data to go with each file (in parallel), write the tree to disk (in parallel). FileTrees is a set of tools to lazy-load, process and save file trees. Built-in parallelism allows you to max out all threads and processes that... -
9
WinMerge
Windows visual diff and merge for files and directories
WinMerge is a Windows tool for visual difference display and merging, for both files and directories. It is highly useful for determining what has changed between file versions, and then merging those changes. WinMerge has Unicode support, Flexible syntax coloring editor, Visual SourceSafe integration, and Windows Shell integration. Regexp filtering for filenames and lines. Side-by-side line difference and highlights differences inside lines. A file map shows the overall file differences in... -
Exact Payments delivers easy-to-integrate embedded payment solutions enabling you to rapidly onboard merchants, instantly activate a variety of payment methods and accelerate your revenue — delivering an end-to-end payment processing platform for SaaS businesses.
-
10
tkdiff
Side-by-side diff viewer, editor and merge preparer
tkdiff is a graphical front end to the diff program. It provides a side-by-side view of the differences between two text files, along with several innovative features such as diff bookmarks, a graphical map of differences for quick navigation, and a facility for slicing diff regions to achieve exactly the merge output desired. -
11
External Compare - Eclipse Plugin
Launch an external diff tool like WinMerge in Eclipse
Eclipse comes with an internal diff / compare editor, but if you prefer a third-party one, this plugin opens an external merge or diff tool for you. After you open two versions of a file in the internal eclipse compare editor, this plugin either opens an external diff tool automatically or you can choose that this plugin opens the external diff tool after you press a button in the toolbar of the internal compare editor. Furthermore the plugin can (optional) format java code before... -
12
YaDT
Yet Another Diff Tool
YaDT - Yet another Diff Tool. It is another front-end for diff and in earlier versions diff3 utility. With YaDT you can compare and merge 2 and/or 3 files. YaDT is written on Tcl/Tk and wrapped in a single executable file with the help of sdx and tclkit. diff and cvs utilities are embedded inside YaDT. Also, YaDT supports Git and Mercurial repositories, but git and hg are not embedded inside YaDT, you should have git/hg executable in your path environment. -
13
rospell is a UTF-8 text editor for programmers and general use. It features syntax highlighting, a code beautifier for C and C++, and support for ctags, grep, diff, and merge. It also includes a speller for English and Romanian.
-
14
Version Control for engineers
Revision control for hardware, engineering and scientific projects
Version Control for engineers (SVN edition) is a freeware Windows collaboration tool for engineers, scientist and designers. Version Control for engineers give you the file revision control for your hardware, engineering and scientific projects. Version Control for engineers is graphical user interface for SVN (Apache Subversion, http://subversion.apache.org/) version control system, special optimized for image, CAD/CAM files and technical visuals. Program supports the file, http... -
15
java-object-merger
Library for merging and mapping of java objects
Main goal of this library is to provide lightweight, easy configurable with annotations, and powerful tool for object mapping/merging, making life easier for projects with multilayer structure. It was take for me less then one day to completely migrate project at my main work (hundreds of classes, mappings between DTOs, Business objects and view objects) from dozer to java-object-merger without any serious issues. Go to Wiki pages for technical FAQ with examples! Available in maven... -
16
Create, check, annotate, merge, diff, split SBML (System Biology Markup Lanugage) documents. The latest version of semanticSBML is webbased with a RESTful interface.
-
17
MergeHero
Java comparison tool for differing and merging folders & files
Dynamsoft has been providing version control solutions for more than 9 years. The MergeHeo is the key component of our source control software - SourceAnywhere. We'd like to see more and more developers use our software, and interact with us. -
18
ESSPEE - Penetration Testing & Forensics
(Android Forensics & Malware Analysis Included)
ESSPEE - Extreme Security Scanning Penetration testing & Exploitation Environment Ubuntu 12.04 LTS (Precise Pangolin) is purposefully selected as the base Operating System to obtain supports from Ubuntu for a long duration (till Apr 2017). It is packed with featured security tools with very less resource consumption and higher degree of stability. Thanks to Back Track, Blackbuntu, CAINE and DEFT and many others for inspiration. Being a sole developer to this distro, I wish it... -
19
-
20
-
21
Diff-ext is an extension for filemanagers such as Windows Explorer and Nautilus that allows to launch diff/merge tools on selected files.
-
22
Meld is a gnome2 diff and merge tool with pluggable support for version control systems such as cvs, subversion, bzr, darcs, mercurial, monotone, tla.
-
23
JMeld is a visual diff and merge tool. It is build to be fast with large files and runs on any operating system. Development on sourceforge has stopped. The project continues at github. https://github.com/MrKuip/JMeld
-
24
Gives an overview (in a graphical-directory-view) where changes have to be done/expected on a three-way-diff. Not to be used for the actual diff/merge itself, but usefull to get an overview in advance.
-
25
A powerful class which allows to create and merge unified diff patches into any file. Fully written in PHP, uses the GNU standard unified diff format and allows any operation (creation/update/deletion).