Downloads:
19,301
Downloads of v 0.0.2096:
5
Last Update:
22 Apr 2024
Published Date:
22 Apr 2024
Reviewed Date:
24 Apr 2024
Reviewer:
Package Maintainer(s):
Software Author(s):
- Sublime HQ Pty Ltd
Tags:
sublimemerge git client merge tool development syntax highlighting- Software Specific:
- Software Site
- Software License
- Software Mailing List
- Software Issues
- Package Specific:
- Package Source
- Package outdated?
- Package broken?
- Contact Maintainers
- Contact Site Admins
- Software Vendor?
- Report Abuse
- Download
Sublime Merge
(Waiting for Maintainer to take corrective action)
- 1
- 2
- 3
0.0.2096 | Updated: 22 Apr 2024
- Software Specific:
- Software Site
- Software License
- Software Mailing List
- Software Issues
- Package Specific:
- Package Source
- Package outdated?
- Package broken?
- Contact Maintainers
- Contact Site Admins
- Software Vendor?
- Report Abuse
- Download
Downloads:
19,301
Downloads of v 0.0.2096:
5
Published:
22 Apr 2024
Reviewed:
24 Apr 2024
Reviewer:
Maintainer(s):
Software Author(s):
- Sublime HQ Pty Ltd
Sublime Merge 0.0.2096
(Waiting for Maintainer to take corrective action)
- 1
- 2
- 3
Some Checks Have Failed or Are Not Yet Complete
Not All Tests Have Passed
This version is in moderation and has not yet been approved. This means it doesn't show up under normal search.
- Until approved, you should consider this package version unsafe - it could do very bad things to your system (it probably doesn't but you have been warned, that's why we have moderation).
- This package version can change wildly over the course of moderation until it is approved. If you install it and it later has changes to this version, you will be out of sync with any changes that have been made to the package. Until approved, you should consider that this package version doesn't even exist.
- You cannot install this package under normal scenarios. See How to install package version under moderation for more information.
- There are also no guarantees that it will be approved.
There are versions of this package awaiting moderation (possibly just this one). See the Version History section below.
Meet a new Git Client, from the makers of Sublime Text.
A snappy UI, three-way merge tool,
side-by-side diffs, syntax highlighting, and more. Evaluate for free – no account, tracking, or time limits.
Interested? Read the release announcement.
Feature Highlights
INTEGRATED MERGE TOOL
The Integrated Merge Tool allows you to resolve any merge conflicts directly in Sublime Merge, rather than having to open up your editor of choice.
Conflicts are presented with a 3-pane view. On the left are your changes and on the right are theirs. In the center pane is the resolved text, with buttons to choose between your changes or theirs. The same text editing functionality as Sublime Text is also available for more complicated merges.
Clicking on the header in the middle pane will switch between the editable merge results and the base file.
Use Ctrl+S or the Save button to save your merged file.
POWERFUL SEARCH
Use find-as-you-type search to dig up the exact commit you're looking for.
Search for commit messages, commit authors, file names, and wildcard patterns. Complex search queries can be constructed using and, or and () symbols.
For example min-parents:2 author:jskinner path:tests/* (bug fix or test) will search for a merge commit from jskinner inside the tests directory that contain the words bug and fix or the word test.
You can open search with Ctrl+F or through the menu: Navigate ▶ Search.
UNMATCHED PERFORMANCE
Sublime Merge is built on the same custom platform as Sublime Text, providing unmatched responsiveness. With a powerful, cross-platform UI toolkit, an unmatched syntax highlighting engine, and a custom high-performance Git reading library, Sublime Merge sets the bar for performance.
BLAME
Open the Blame of a file through the Command Palette or when viewing a commit to see exactly which lines of the file were added by which commits.
Easily view the age, author, and commit hash of every line of code and see which lines come from the same commit with our commit color coding. Click a line in the gutter to highlight all other lines from the same commit.
The blame tool will also detect when a piece of code was moved from another place in your repository, so you can truly follow the history of your code.
ADVANCED DIFFS
Where it makes sense we will show you exactly which individual characters have been changed for a commit.
This includes when you rename or move a file, when you're resolving conflicts or just viewing commit history.
Select any two commits in Sublime Merge with Ctrl+Left Mouse to show the diff between them.
FILE AND HUNK HISTORY
From any file or hunk in the history use … ▶ File History or the Hunk History button to view the full history of that source code. This will also follow any file moves or renames throughout the repository.
COMMAND PALETTE AND KEY BINDINGS
Keyboard usage is important to us. Use Tab to navigate through parts of the application, Space to toggle expansion, and Enter to stage/unstage hunks. When writing a commit message, use Ctrl+Enter to commit.
The Command Palette is triggered by Ctrl+P and allows quick access to a large set of Git commands as well as other Sublime Merge functionality.
LIGHT AND DARK THEMES
Choose between a light and a dark theme to suit your tastes. You can preview these themes above.
Open the Preferences ▶ Preferences… menu to change theme.
The dark theme is only available with a valid license key.
EXTENSIBILITY
Just like Sublime Text, just about everything in Sublime Merge is extensible. Key bindings, menus, theming, and the command palette are all customizable with simple JSON files.
And more... See all features on https://www.sublimemerge.com.
$ErrorActionPreference = 'Stop'
Uninstall-BinFile -Name 'smerge'
$packageArgs = @{
packageName = $env:ChocolateyPackageName
softwareName = 'Sublime Merge'
fileType = 'exe'
silentArgs = '/SILENT /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /TASKS="contextentry"'
validExitCodes = @(0)
}
[array]$key = Get-UninstallRegistryKey @packageArgs
if ($key.Count -eq 1) {
$key | ForEach-Object {
$packageArgs['file'] = "$($_.UninstallString)"
Uninstall-ChocolateyPackage @packageArgs
}
}
elseif ($key.Count -eq 0) {
Write-Warning "$env:ChocolateyPackageName has already been uninstalled by other means."
}
elseif ($key.Count -gt 1) {
Write-Warning "$key.Count matches found!"
Write-Warning "To prevent accidental data loss, no programs will be uninstalled."
Write-Warning "Please alert package maintainer the following keys were matched:"
$key | ForEach-Object {
Write-Warning "- $_.DisplayName"
}
}
No results available for this package. We are building up results for older packages over time so expect to see results. If this is a new package, it should have results within a day or two.
Add to Builder | Version | Downloads | Last Updated | Status |
---|---|---|---|---|
Sublime Merge 0.0.2096 | 5 | Monday, April 22, 2024 |
Waiting for Maintainer
|
|
Sublime Merge 0.0.2095-dev | 36 | Friday, April 19, 2024 | Exempted | |
Sublime Merge 0.0.2094-dev | 39 | Thursday, April 11, 2024 | Exempted | |
Sublime Merge 0.0.2093-dev | 16 | Wednesday, April 10, 2024 | Exempted | |
Sublime Merge 0.0.2092-dev | 256 | Friday, October 27, 2023 | Exempted | |
Sublime Merge 0.0.2090-dev | 157 | Monday, August 21, 2023 | Exempted | |
Sublime Merge 0.0.2089-dev | 30 | Thursday, August 17, 2023 | Exempted | |
Sublime Merge 0.0.2088-dev | 34 | Wednesday, August 16, 2023 | Exempted | |
Sublime Merge 0.0.2087-dev | 32 | Friday, August 11, 2023 | Exempted | |
Sublime Merge 0.0.2085.20230518-dev | 188 | Thursday, May 18, 2023 | Exempted | |
Sublime Merge 0.0.2085-dev | 45 | Friday, March 17, 2023 | Approved | |
Sublime Merge 0.0.2084-dev | 28 | Friday, March 17, 2023 | Approved | |
Sublime Merge 0.0.2083 | 2558 | Tuesday, February 7, 2023 | Approved | |
Sublime Merge 0.0.2082-dev | 34 | Tuesday, January 31, 2023 | Approved | |
Sublime Merge 0.0.2081-dev | 50 | Tuesday, December 13, 2022 | Approved | |
Sublime Merge 0.0.2080-dev | 36 | Tuesday, December 6, 2022 | Approved | |
Sublime Merge 0.0.2079 | 1067 | Monday, November 14, 2022 | Approved | |
Sublime Merge 0.0.2078-dev | 40 | Wednesday, November 2, 2022 | Approved | |
Sublime Merge 0.0.2077 | 1058 | Tuesday, August 23, 2022 | Approved | |
Sublime Merge 0.0.2076-dev | 44 | Thursday, August 11, 2022 | Approved | |
Sublime Merge 0.0.2075-dev | 53 | Tuesday, July 26, 2022 | Approved | |
Sublime Merge 0.0.2074 | 925 | Friday, June 10, 2022 | Approved | |
Sublime Merge 0.0.2073-dev | 46 | Monday, June 6, 2022 | Approved | |
Sublime Merge 0.0.2072-dev | 60 | Tuesday, May 10, 2022 | Approved | |
Sublime Merge 0.0.2071 | 773 | Monday, April 25, 2022 | Approved | |
Sublime Merge 0.0.2070-dev | 62 | Thursday, April 21, 2022 | Exempted | |
Sublime Merge 0.0.2069-dev | 59 | Thursday, March 17, 2022 | Approved | |
Sublime Merge 0.0.2068 | 1270 | Tuesday, December 21, 2021 | Approved | |
Sublime Merge 0.0.2063 | 663 | Thursday, November 11, 2021 | Approved | |
Sublime Merge 0.0.2059 | 1261 | Friday, July 23, 2021 | Approved | |
Sublime Merge 0.0.2056 | 871 | Monday, May 17, 2021 | Approved | |
Sublime Merge 0.0.2054 | 372 | Tuesday, May 4, 2021 | Approved | |
Sublime Merge 0.0.2049 | 696 | Friday, March 12, 2021 | Approved | |
Sublime Merge 0.0.2047 | 528 | Tuesday, February 23, 2021 | Approved | |
Sublime Merge 0.0.2039 | 964 | Monday, November 16, 2020 | Approved | |
Sublime Merge 0.0.2038 | 490 | Friday, October 30, 2020 | Approved | |
Sublime Merge 0.0.2032 | 724 | Tuesday, August 25, 2020 | Approved | |
Sublime Merge 0.0.2027 | 124 | Tuesday, July 28, 2020 | Approved | |
Sublime Merge 0.0.2025 | 562 | Wednesday, July 22, 2020 | Approved | |
Sublime Merge 0.0.2020 | 656 | Tuesday, May 26, 2020 | Approved | |
Sublime Merge 0.0.1119 | 1543 | Tuesday, October 1, 2019 | Approved | |
Sublime Merge 0.0.1116 | 527 | Monday, June 3, 2019 | Approved | |
Sublime Merge 0.0.1107 | 285 | Thursday, April 11, 2019 | Approved |
© Sublime HQ Pty Ltd
This package has no dependencies.
Ground Rules:
- This discussion is only about Sublime Merge and the Sublime Merge package. If you have feedback for Chocolatey, please contact the Google Group.
- This discussion will carry over multiple versions. If you have a comment about a particular version, please note that in your comments.
- The maintainers of this Chocolatey Package will be notified about new comments that are posted to this Disqus thread, however, it is NOT a guarantee that you will get a response. If you do not hear back from the maintainers after posting a message below, please follow up by using the link on the left side of this page or follow this link to contact maintainers. If you still hear nothing back, please follow the package triage process.
- Tell us what you love about the package or Sublime Merge, or tell us what needs improvement.
- Share your experiences with the package, or extra configuration or gotchas that you've found.
- If you use a url, the comment will be flagged for moderation until you've been whitelisted. Disqus moderated comments are approved on a weekly schedule if not sooner. It could take between 1-5 days for your comment to show up.
chtof (maintainer) on 22 Apr 2024 08:26:06 +00:00:
User 'chtof' (maintainer) submitted package.
chocolatey-ops (reviewer) on 22 Apr 2024 08:58:57 +00:00:
sublimemerge has passed automated validation. It may have or may still fail other checks like testing (verification).
Congratulations! This package passed automatic validation review without flagging on any issues the validator currently checks. A human review could still turn up issues a computer may not easily find.
chocolatey-ops (reviewer) on 22 Apr 2024 09:11:19 +00:00:
sublimemerge has failed automated package testing (verification).
Please visit https://gist.github.com/choco-bot/ccb876f50bbb3091f6027daa715de417 for details.
The package status will be changed and will be waiting on your next actions.
Windos (reviewer) on 24 Apr 2024 00:27:17 +00:00:
Verification Status Change - Verification tests have been set to rerun.
chocolatey-ops (reviewer) on 24 Apr 2024 01:03:47 +00:00:
sublimemerge has failed automated package testing (verification).
Please visit https://gist.github.com/choco-bot/bf1246875e6ff2de6c0113c632ed78a4 for details.
The package status will be changed and will be waiting on your next actions.