-
Notifications
You must be signed in to change notification settings - Fork 5.2k
ktsu.blastmerge v1.0.11 #262069
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
microsoft-github-policy-service
merged 8 commits into
microsoft:master
from
matt-edmondson:ktsu.BlastMerge
Jun 7, 2025
Merged
ktsu.blastmerge v1.0.11 #262069
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
126d7d0
Add ktsu.BlastMerge v1.0.10
matt-edmondson f89dc16
Remove incompatible scope property
matt-edmondson 7302750
Add ktsu.BlastMerge v1.0.11 with new installer and locale files, repl…
matt-edmondson 6cfa639
Update ktsu.BlastMerge.installer.yaml
matt-edmondson 1b4b766
Update ktsu.BlastMerge.locale.en-US.yaml
matt-edmondson 5bba3eb
Update ktsu.BlastMerge.yaml
matt-edmondson bd7e49f
Add ktsu.BlastMerge v1.0.14 with installer, locale, and version manif…
matt-edmondson c9e71a4
Add ktsu.BlastMerge v1.0.19 with installer, locale, and version manif…
matt-edmondson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
54 changes: 54 additions & 0 deletions
54
manifests/k/ktsu/BlastMerge/1.0.11/ktsu.BlastMerge.installer.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
PackageIdentifier: ktsu.BlastMerge | ||
PackageVersion: 1.0.11 | ||
Platform: | ||
- Windows.Desktop | ||
MinimumOSVersion: 10.0.17763.0 | ||
InstallerType: zip | ||
InstallModes: | ||
- interactive | ||
- silent | ||
UpgradeBehavior: install | ||
Commands: | ||
- blastmerge | ||
- BlastMerge.ConsoleApp | ||
FileExtensions: | ||
- txt | ||
- md | ||
- json | ||
- yml | ||
- yaml | ||
- xml | ||
- config | ||
- cs | ||
- js | ||
- py | ||
- java | ||
- cpp | ||
- c | ||
- h | ||
- hpp | ||
ReleaseDate: 2025-05-31 | ||
Installers: | ||
- Architecture: x64 | ||
InstallerUrl: https://github.com/ktsu-dev/BlastMerge/releases/download/v1.0.11/BlastMerge.ConsoleApp-1.0.11-win-x64.zip | ||
InstallerSha256: 59FCECE61A50D6966CC1657D0CF9434EA1AF188D23220010E7B4A9ABFE0567AC | ||
NestedInstallerType: portable | ||
NestedInstallerFiles: | ||
- RelativeFilePath: ktsu.BlastMerge.ConsoleApp.exe | ||
PortableCommandAlias: blastmerge | ||
- Architecture: x86 | ||
InstallerUrl: https://github.com/ktsu-dev/BlastMerge/releases/download/v1.0.11/BlastMerge.ConsoleApp-1.0.11-win-x86.zip | ||
InstallerSha256: E1A30B74687FDBB83EA9C234A368024E74BA9D458685455971CFE82D4F651926 | ||
NestedInstallerType: portable | ||
NestedInstallerFiles: | ||
- RelativeFilePath: ktsu.BlastMerge.ConsoleApp.exe | ||
PortableCommandAlias: blastmerge | ||
- Architecture: arm64 | ||
InstallerUrl: https://github.com/ktsu-dev/BlastMerge/releases/download/v1.0.11/BlastMerge.ConsoleApp-1.0.11-win-arm64.zip | ||
InstallerSha256: 2D4FA1EF54D80BF810DE4E0509446073A38B129D1DF1284EE926F7D291C0006A | ||
NestedInstallerType: portable | ||
NestedInstallerFiles: | ||
- RelativeFilePath: ktsu.BlastMerge.ConsoleApp.exe | ||
PortableCommandAlias: blastmerge | ||
ManifestType: installer | ||
ManifestVersion: 1.6.0 |
50 changes: 50 additions & 0 deletions
50
manifests/k/ktsu/BlastMerge/1.0.11/ktsu.BlastMerge.locale.en-US.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
PackageIdentifier: ktsu.BlastMerge | ||
matt-edmondson marked this conversation as resolved.
Show resolved
Hide resolved
|
||
PackageVersion: 1.0.11 | ||
PackageLocale: en-US | ||
Publisher: ktsu.dev | ||
PublisherUrl: https://github.com/ktsu-dev | ||
PublisherSupportUrl: https://github.com/ktsu-dev/BlastMerge/issues | ||
# PrivacyUrl: | ||
Author: ktsu.dev | ||
PackageName: BlastMerge | ||
PackageUrl: https://github.com/ktsu-dev/BlastMerge | ||
License: MIT | ||
LicenseUrl: https://github.com/ktsu-dev/BlastMerge/blob/main/LICENSE.md | ||
Copyright: Copyright (c) ktsu.dev | ||
# CopyrightUrl: | ||
ShortDescription: Cross-repository file synchronization through intelligent iterative merging | ||
Description: |- | ||
BlastMerge is a revolutionary file synchronization tool that uses intelligent iterative merging to unify multiple versions of files across repositories, directories, and codebases. | ||
Unlike traditional diff tools, BlastMerge progressively merges file versions by finding the most similar pairs and resolving conflicts interactively, ultimately synchronizing entire file ecosystems into a single, unified version. | ||
|
||
Key Features: | ||
- Smart Discovery: Automatically finds all versions of a file across directories/repositories | ||
- Hash-Based Grouping: Groups identical files and identifies unique versions | ||
- Similarity Analysis: Calculates similarity scores between all version pairs | ||
- Optimal Merge Order: Progressively merges the most similar versions first to minimize conflicts | ||
- Interactive Resolution: Visual TUI for resolving conflicts block-by-block | ||
- Cross-Repository Sync: Updates all file locations with the final merged result | ||
Moniker: blastmerge | ||
Tags: | ||
- diff | ||
- merge | ||
- sync | ||
- git | ||
- files | ||
- repository | ||
- cli | ||
- tui | ||
- synchronization | ||
- version-control | ||
ReleaseNotes: |- | ||
Cross-repository file synchronization through intelligent iterative merging. | ||
|
||
See full changelog at: https://github.com/ktsu-dev/BlastMerge/blob/main/CHANGELOG.md | ||
ReleaseNotesUrl: https://github.com/ktsu-dev/BlastMerge/releases/tag/v1.0.11 | ||
# PurchaseUrl: | ||
# InstallationNotes: | ||
Documentations: | ||
- DocumentLabel: README | ||
DocumentUrl: https://github.com/ktsu-dev/BlastMerge/blob/main/README.md | ||
ManifestType: defaultLocale | ||
ManifestVersion: 1.6.0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
PackageIdentifier: ktsu.BlastMerge | ||
matt-edmondson marked this conversation as resolved.
Show resolved
Hide resolved
|
||
PackageVersion: 1.0.11 | ||
DefaultLocale: en-US | ||
ManifestType: version | ||
ManifestVersion: 1.6.0 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.