Search Results for "diff merge"
Sort By:
Showing 16 open source projects for "diff merge"
View related business solutions-
Compliant and Reliable File Transfers Backed by Top Security CertificationsStop relying on non-certified, legacy file transfer tools that creak under the weight of modern security demands. Get full audit trails, advanced access controls and more supported by an award-winning team of experts. Start your free 25-day trial today.
-
Ship Agents FasterGemini Enterprise Agent Platform lets you rapidly build, scale, govern and optimize production-ready agents grounded in your organization's data. The platform enables developers to build custom or pre-built agents for virtually any use case. New customers get $300 in free credits.
-
1
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. ... -
2
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. -
3
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. ... -
4
Diff-ext is an extension for filemanagers such as Windows Explorer and Nautilus that allows to launch diff/merge tools on selected files.
-
Custom VMs From 1 to 96 vCPUs With 99.95% UptimeLive migration and automatic failover keep workloads online through maintenance. One free e2-micro VM every month.
-
5
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. -
6
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. -
7
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... -
8
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. ... -
9
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. -
Host LLMs in Production With On-Demand GPUsDeploy your model, get an endpoint, pay only for compute time. No GPU provisioning or infrastructure management required.
-
10
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. -
11
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... -
12
-
13
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.
-
14
WinMergeX is a branch of the WinMerge visual diff tool. It is a MS-Windows diff tool allowing merge of individual files.
-
15
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).
-
16
- Previous
- You're on page 1
- Next
