Search Results for "merge diff"
Sort By:
Showing 36 open source projects for "merge diff"
View related business solutions-
Build Securely on Azure with Proven FrameworksMoving to the cloud brings new challenges. How can you manage a larger attack surface while ensuring great network performance? Turn to Fortinet’s Tested Reference Architectures, blueprints for designing and securing cloud environments built by cybersecurity experts. Learn more and explore use cases in this white paper.
-
$300 in Free Credit Towards Top Cloud ServicesStart your project in minutes. After credits run out, 20+ products include free monthly usage. Only pay when you're ready to scale.
-
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
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 when diffing and merging notebooks. Many of us who are writing and sharing notebooks do so with git and GitHub. ... -
3
TortoiseGit
Windows Explorer Extension to Operate Git
...Instead of relying solely on command-line Git commands, TortoiseGit gives developers a user-friendly interface: overlay icons show file statuses (modified, untracked, committed, etc.), and right-click context menus bring up Git operations like commit, push, pull, branch management, and diff/merge tools. It includes utilities for visual diff/merge, history browsing, and conflict resolution, making version control more accessible especially for those less comfortable with the command line. Because it integrates at the shell level, you can manage repositories from anywhere in Windows Explorer — without needing to open a separate GUI or IDE. -
4
DoltgreSQL
DoltgreSQL - Version Controlled PostgreSQL
DoltgreSQL is an experimental Postgres fork that adds Git-like version control to your database. It allows users to commit, branch, merge, and revert changes to data and schema, bringing collaborative workflows to SQL databases. DoltgreSQL is designed for teams who want full auditability and control over every change made in their data layer. -
Earn up to 16% annual interest with Nexo.Generate interest, borrow against your crypto, and trade a range of cryptocurrencies — all in one platform. Geographic restrictions, eligibility, and terms apply.
-
5
Pragma-git
Pragma-git is a friendly pragmatic git control app
...Note-taking, wysiwyg or markdown, with todo lists, etc. Auto-push to the remote repository (can be disabled in settings) Auto-fetch, and indication if the pull is possible. Standard git features, such as branch, 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. -
6
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}, but this will only work if the current branch has an upstream/tracking branch. ... -
7
Diff-ext is an extension for filemanagers such as Windows Explorer and Nautilus that allows to launch diff/merge tools on selected files.
-
8
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. -
9
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... -
Full-stack observability with actually useful AI | Grafana CloudBuilt on open standards like Prometheus and OpenTelemetry, Grafana Cloud includes Kubernetes Monitoring, Application Observability, Incident Response, plus the AI-powered Grafana Assistant. Get started with our generous free tier today.
-
10
GitUp
A Git interface to work quickly and safely
...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 out from unwanted changes. GitUp's Snapshot feature builds a Time-Machine-like history of every change made to your repo, allowing you to step backwards to any point in time. Rewrite, split, delete, and re-order commits, fixup and squash, cherry-pick, merge, rebase, etc. ... -
11
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... -
12
yamlfmt
An extensible command line tool or library to format yaml files
...Configuration is file-based, allowing teams to pin indentation, line wrapping, and other house-style choices repo-wide. By normalizing structure while preserving meaning, it reduces diff noise and merge friction in configs, Kubernetes manifests, and automation playbooks. The project is intentionally extensible, so organizations can add custom formatters or rules without forking. -
13
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... -
14
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... -
15
ThinkReview
AI-powered code reviews for GitLab & Azure DevOps. Zero setup. Powered
I Copilot for Gitlab and Azure DevOps Merge requests (MRs) and Pull Requests (PRs) in your browser. The extension Summarises merge requests , provided suggestions and find potential security issues , provide smart questions to dive deeper and chat with your pull requests The extension works out of the box without any complex setup - Supports custom Self hosted Gitlab as well as gitlab.com and gitlab enterprise Enhance your GitLab MRs and Azure Devops PRsworkflows with automatic patch diff access and AI-powered code reviews. ... -
16
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. -
17
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. -
18
WordGit
WordGit for Mac
A tool that allows you to diff and merge Word (.docx) files with git. Currently Mac only. -
19
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.
-
20
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... -
21
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... -
22
Create, check, annotate, merge, diff, split SBML (System Biology Markup Lanugage) documents. The latest version of semanticSBML is webbased with a RESTful interface.
-
23
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. -
24
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... -
25
