winmerge2011Fork of WinMerge which has a different set of features
Stars: β 36 (+157.14%)
git-resolve-conflictπ² β β β
Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
Stars: β 44 (+214.29%)
excel-mergeA PHP library to merge two or more Excel files into one
Stars: β 26 (+85.71%)
revctrl.orgAn extract, as complete as I can make it, of content from the revctrl.org wiki
Stars: β 13 (-7.14%)
lobicornisπ€ [Myrmica Lobicornis π] Bot: Update and Merge Pull Request
Stars: β 27 (+92.86%)
miniconMinimization of the filesystem for containers
Stars: β 70 (+400%)
DPVideoMerger-SwiftMultiple videos merge in one video with manage scale & aspect ratio and also merge videos to grid matrix layout for Swift.
Stars: β 49 (+250%)
jQuery-Merge-for-php-diffA client side merge tool for JBlonds PHP-Diff @ https://github.com/JBlond/php-diff.
Stars: β 74 (+428.57%)
DPVideoMergerMultiple videos merge in one video with manage scale & aspect ratio and also merge 4 videos to grid layou for Objective C.
Stars: β 12 (-14.29%)
mergedeepA deep merge function for π.
Stars: β 73 (+421.43%)
srtmergersubtitle merger is a tool for merging two or more subtitles for videos.
Stars: β 35 (+150%)
deepmerge-tsDeeply merge 2 or more objects respecting type information.
Stars: β 102 (+628.57%)
defaults-deepLike `extend` but recursively copies only the missing properties/values to the target object.
Stars: β 26 (+85.71%)
SyncedStoreSyncedStore CRDT is an easy-to-use library for building live, collaborative applications that sync automatically.
Stars: β 1,053 (+7421.43%)
cidr-mergerA simple command line tool to merge ip/ip cidr/ip range, supports IPv4/IPv6
Stars: β 99 (+607.14%)
git-pickedList merged and cherry-picked branches
Stars: β 30 (+114.29%)
ConflictResolverAn 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.
Stars: β 24 (+71.43%)
git-json-mergeA git merge driver that use xdiff to automatically resolve merge conflicts in json files. This project was inspired by git-po-merge.
Stars: β 86 (+514.29%)
PixelGlitchImage glitch visualization using various Pixel Sorting methods for Processing
Stars: β 25 (+78.57%)
php-mergePhp library to merge text. 3 way merge like git in php.
Stars: β 26 (+85.71%)
syncthing-resolve-conflictsA small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
Stars: β 61 (+335.71%)
ConflictJSFinding and Understanding Conflicts Between JavaScript Libraries
Stars: β 39 (+178.57%)
diffyTools for finding and manipulating differences between files
Stars: β 47 (+235.71%)
FacEasy-to-use CUI for fixing git conflicts
Stars: β 1,738 (+12314.29%)
NbdimeTools for diffing and merging of Jupyter notebooks.
Stars: β 2,135 (+15150%)
WinmergeWinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.
Stars: β 2,358 (+16742.86%)
MergoWritten by Dario CastaΓ±Γ©.
Stars: β 1,808 (+12814.29%)
PdfsamPDFsam, a desktop application to extract pages, split, merge, mix and rotate PDF files
Stars: β 1,829 (+12964.29%)
markdown-to-documentA Markdown CLI to easily generate HTML documents from Markdown files
Stars: β 28 (+100%)
treediff-rsExtract differences between arbitrary datastructures
Stars: β 52 (+271.43%)
zipPHP ZipArchive toolbox
Stars: β 30 (+114.29%)
AehnlichShow/Merge differences in directories and their content (text files) in Light/Dark designs
Stars: β 73 (+421.43%)
tilerN-dimensional NumPy array tiling and merging with overlapping, padding and tapering
Stars: β 26 (+85.71%)
git-explodeExplode linear sequence of git commits into topic branches
Stars: β 43 (+207.14%)