Unpacking Software Livestream

Join our monthly Unpacking Software livestream to hear about the latest news, chat and opinion on packaging, software deployment and lifecycle management!

Learn More

Chocolatey Product Spotlight

Join the Chocolatey Team on our regular monthly stream where we put a spotlight on the most recent Chocolatey product releases. You'll have a chance to have your questions answered in a live Ask Me Anything format.

Learn More

Chocolatey Coding Livestream

Join us for the Chocolatey Coding Livestream, where members of our team dive into the heart of open source development by coding live on various Chocolatey projects. Tune in to witness real-time coding, ask questions, and gain insights into the world of package management. Don't miss this opportunity to engage with our team and contribute to the future of Chocolatey!

Learn More

Calling All Chocolatiers! Whipping Up Windows Automation with Chocolatey Central Management

Webinar from
Wednesday, 17 January 2024

We are delighted to announce the release of Chocolatey Central Management v0.12.0, featuring seamless Deployment Plan creation, time-saving duplications, insightful Group Details, an upgraded Dashboard, bug fixes, user interface polishing, and refined documentation. As an added bonus we'll have members of our Solutions Engineering team on-hand to dive into some interesting ways you can leverage the new features available!

Watch On-Demand
Chocolatey Community Coffee Break

Join the Chocolatey Team as we discuss all things Community, what we do, how you can get involved and answer your Chocolatey questions.

Watch The Replays
Chocolatey and Intune Overview

Webinar Replay from
Wednesday, 30 March 2022

At Chocolatey Software we strive for simple, and teaching others. Let us teach you just how simple it could be to keep your 3rd party applications updated across your devices, all with Intune!

Watch On-Demand
Chocolatey For Business. In Azure. In One Click.

Livestream from
Thursday, 9 June 2022

Join James and Josh to show you how you can get the Chocolatey For Business recommended infrastructure and workflow, created, in Azure, in around 20 minutes.

Watch On-Demand
The Future of Chocolatey CLI

Livestream from
Thursday, 04 August 2022

Join Paul and Gary to hear more about the plans for the Chocolatey CLI in the not so distant future. We'll talk about some cool new features, long term asks from Customers and Community and how you can get involved!

Watch On-Demand
Hacktoberfest Tuesdays 2022

Livestreams from
October 2022

For Hacktoberfest, Chocolatey ran a livestream every Tuesday! Re-watch Cory, James, Gary, and Rain as they share knowledge on how to contribute to open-source projects such as Chocolatey CLI.

Watch On-Demand

Downloads:

19,829

Downloads of v 0.0.2096:

10

Last Update:

22 Apr 2024

Package Maintainer(s):

Software Author(s):

  • Sublime HQ Pty Ltd

Tags:

sublimemerge git client merge tool development syntax highlighting

Sublime Merge

Downloads:

19,829

Downloads of v 0.0.2096:

10

Maintainer(s):

Software Author(s):

  • Sublime HQ Pty Ltd

Sublime Merge

  • 1
  • 2
  • 3

Some Checks Have Failed or Are Not Yet Complete

Not All Tests Have Passed


Validation Testing Passed


Verification Testing Failed

Details

Scan Testing Pending

WARNING

This package was rejected on 29 May 2024. The reviewer chocolatey-ops has listed the following reason(s):

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.

  • NEW! We have a test environment for you to replicate the testing we do. This can be used at any time to test packages! See https://github.com/chocolatey-community/chocolatey-test-environment
  • Please log in and leave a review comment if you have questions and/or comments.
  • If you see the verifier needs to rerun testing against the package without resubmitting (a issue in the test results), you can do that on the package page in the review section.
  • If the verifier is incompatible with the package, please log in and leave a review comment if the package needs to bypass testing (e.g. package installs specific drivers).
  • Automated testing can also fail when a package is not completely silent or has pop ups (AutoHotKey can assist - a great example is the VeraCrypt package).
  • A package that cannot be made completely unattended should have the notSilent tag. Note that this must be approved by moderators.

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.

  • NEW! We have a test environment for you to replicate the testing we do. This can be used at any time to test packages! See https://github.com/chocolatey-community/chocolatey-test-environment
  • Please log in and leave a review comment if you have questions and/or comments.
  • If you see the verifier needs to rerun testing against the package without resubmitting (a issue in the test results), you can do that on the package page in the review section.
  • If the verifier is incompatible with the package, please log in and leave a review comment if the package needs to bypass testing (e.g. package installs specific drivers).
  • Automated testing can also fail when a package is not completely silent or has pop ups (AutoHotKey can assist - a great example is the VeraCrypt package).
  • A package that cannot be made completely unattended should have the notSilent tag. Note that this must be approved by moderators.

chocolatey-ops (reviewer) on 14 May 2024 00:32:02 +00:00:

We've found sublimemerge v0.0.2096 in a submitted status and waiting for your next actions. It has had no updates for 20 or more days since a reviewer has asked for corrections. Please note that if there is no response or fix of the package within 15 days of this message, this package version will automatically be closed (rejected) due to being stale.

Take action:

  • Log in to the site and respond to the review comments.
  • Resubmit fixes for this version.
  • If the package version is failing automated checks, you can self-reject the package.

If your package is failing automated testing, you can use the chocolatey test environment to manually run the verification and determine what may need to be fixed.

Note: We don't like to see packages automatically rejected. It doesn't mean that we don't value your contributions, just that we can not continue to hold packages versions in a waiting status that have possibly been abandoned. If you don't believe you will be able to fix up this version of the package within 15 days, we strongly urge you to log in to the site and respond to the review comments until you are able to.

chocolatey-ops (reviewer) on 29 May 2024 00:32:57 +00:00:

Unfortunately there has not been progress to move sublimemerge v0.0.2096 towards an approved status within 15 days after the last review message, so we need to close (reject) the package version at this time. If you want to pick this version up and move it towards approval in the future, use the contact site admins link on the package page and we can move it back into a submitted status so you can submit updates.

Status Change - Changed status of package from 'submitted' to 'rejected'.

Description

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.

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.

screenshot


tools\chocolateyinstall.ps1
$ErrorActionPreference = 'Stop';

$packageArgs = @{
  packageName   = $env:ChocolateyPackageName
    
  url64         = 'https://download.sublimetext.com/sublime_merge_build_2096_x64_setup.exe'
  checksum64    = 'd7897db60b13c8aa451a8e7af45853c4dc2648faad1380f9b892069159360a60'
  checksumType  = 'sha256'
  
  
  silentArgs	= "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-"
}

Install-ChocolateyPackage @packageArgs


[array]$key = Get-UninstallRegistryKey @packageArgs

If ($key.Count -eq 1) {
  $key | ForEach-Object {
    $submergeInstallLocation = Join-Path -Path $_.InstallLocation -ChildPath 'smerge.exe'
    Install-BinFile -Name 'smerge' -Path "$submergeInstallLocation"
  }
}
tools\chocolateyuninstall.ps1
$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.2095-dev 164 Friday, April 19, 2024 Exempted
Sublime Merge 0.0.2094-dev 46 Thursday, April 11, 2024 Exempted
Sublime Merge 0.0.2093-dev 21 Wednesday, April 10, 2024 Exempted
Sublime Merge 0.0.2092-dev 262 Friday, October 27, 2023 Exempted
Sublime Merge 0.0.2090-dev 161 Monday, August 21, 2023 Exempted
Sublime Merge 0.0.2089-dev 36 Thursday, August 17, 2023 Exempted
Sublime Merge 0.0.2088-dev 41 Wednesday, August 16, 2023 Exempted
Sublime Merge 0.0.2087-dev 38 Friday, August 11, 2023 Exempted
Sublime Merge 0.0.2085.20230518-dev 196 Thursday, May 18, 2023 Exempted
Sublime Merge 0.0.2085-dev 49 Friday, March 17, 2023 Approved
Sublime Merge 0.0.2084-dev 33 Friday, March 17, 2023 Approved
Sublime Merge 0.0.2082-dev 39 Tuesday, January 31, 2023 Approved
Sublime Merge 0.0.2081-dev 55 Tuesday, December 13, 2022 Approved
Sublime Merge 0.0.2080-dev 42 Tuesday, December 6, 2022 Approved
Sublime Merge 0.0.2079 1073 Monday, November 14, 2022 Approved
Sublime Merge 0.0.2078-dev 46 Wednesday, November 2, 2022 Approved
Sublime Merge 0.0.2077 1062 Tuesday, August 23, 2022 Approved
Sublime Merge 0.0.2076-dev 47 Thursday, August 11, 2022 Approved
Sublime Merge 0.0.2075-dev 57 Tuesday, July 26, 2022 Approved
Sublime Merge 0.0.2074 929 Friday, June 10, 2022 Approved
Sublime Merge 0.0.2073-dev 52 Monday, June 6, 2022 Approved
Sublime Merge 0.0.2072-dev 65 Tuesday, May 10, 2022 Approved
Sublime Merge 0.0.2071 780 Monday, April 25, 2022 Approved
Sublime Merge 0.0.2070-dev 67 Thursday, April 21, 2022 Exempted
Sublime Merge 0.0.2069-dev 65 Thursday, March 17, 2022 Approved
Sublime Merge 0.0.2068 1272 Tuesday, December 21, 2021 Approved
Sublime Merge 0.0.2063 668 Thursday, November 11, 2021 Approved
Sublime Merge 0.0.2059 1267 Friday, July 23, 2021 Approved
Sublime Merge 0.0.2056 879 Monday, May 17, 2021 Approved
Sublime Merge 0.0.2054 376 Tuesday, May 4, 2021 Approved
Sublime Merge 0.0.2049 703 Friday, March 12, 2021 Approved
Sublime Merge 0.0.2047 536 Tuesday, February 23, 2021 Approved
Sublime Merge 0.0.2039 973 Monday, November 16, 2020 Approved
Sublime Merge 0.0.2038 495 Friday, October 30, 2020 Approved
Sublime Merge 0.0.2032 729 Tuesday, August 25, 2020 Approved
Sublime Merge 0.0.2027 127 Tuesday, July 28, 2020 Approved
Sublime Merge 0.0.2025 565 Wednesday, July 22, 2020 Approved
Sublime Merge 0.0.2020 663 Tuesday, May 26, 2020 Approved
Sublime Merge 0.0.1119 1547 Tuesday, October 1, 2019 Approved
Sublime Merge 0.0.1116 530 Monday, June 3, 2019 Approved
Sublime Merge 0.0.1107 293 Thursday, April 11, 2019 Approved

This package has no dependencies.

Discussion for the Sublime Merge Package

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.
comments powered by Disqus