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:

21,473

Downloads of v 0.0.2076-dev:

57

Last Update:

11 Aug 2022

Package Maintainer(s):

Software Author(s):

  • Sublime HQ Pty Ltd

Tags:

sublimemerge git client merge tool development syntax highlighting

Sublime Merge

This is a prerelease version of Sublime Merge.

  • 1
  • 2
  • 3

0.0.2076-dev | Updated: 11 Aug 2022

Downloads:

21,473

Downloads of v 0.0.2076-dev:

57

Maintainer(s):

Software Author(s):

  • Sublime HQ Pty Ltd

Sublime Merge 0.0.2076-dev

This is a prerelease version of Sublime Merge.

Legal Disclaimer: Neither this package nor Chocolatey Software, Inc. are affiliated with or endorsed by Sublime HQ Pty Ltd. The inclusion of Sublime HQ Pty Ltd trademark(s), if any, upon this webpage is solely to identify Sublime HQ Pty Ltd goods or services and not for commercial purposes.

  • 1
  • 2
  • 3

All Checks are Passing

3 Passing Tests


Validation Testing Passed


Verification Testing Passed

Details

Scan Testing Successful:

No detections found in any package files

Details
Learn More

Deployment Method: Individual Install, Upgrade, & Uninstall

To install Sublime Merge, run the following command from the command line or from PowerShell:

>

To upgrade Sublime Merge, run the following command from the command line or from PowerShell:

>

To uninstall Sublime Merge, run the following command from the command line or from PowerShell:

>

Deployment Method:

NOTE

This applies to both open source and commercial editions of Chocolatey.

1. Enter Your Internal Repository Url

(this should look similar to https://community.chocolatey.org/api/v2/)


2. Setup Your Environment

1. Ensure you are set for organizational deployment

Please see the organizational deployment guide

2. Get the package into your environment

  • Open Source or Commercial:
    • Proxy Repository - Create a proxy nuget repository on Nexus, Artifactory Pro, or a proxy Chocolatey repository on ProGet. Point your upstream to https://community.chocolatey.org/api/v2/. Packages cache on first access automatically. Make sure your choco clients are using your proxy repository as a source and NOT the default community repository. See source command for more information.
    • You can also just download the package and push it to a repository Download

3. Copy Your Script

choco upgrade sublimemerge -y --source="'INTERNAL REPO URL'" --version="'0.0.2076-dev'" --prerelease [other options]

See options you can pass to upgrade.

See best practices for scripting.

Add this to a PowerShell script or use a Batch script with tools and in places where you are calling directly to Chocolatey. If you are integrating, keep in mind enhanced exit codes.

If you do use a PowerShell script, use the following to ensure bad exit codes are shown as failures:


choco upgrade sublimemerge -y --source="'INTERNAL REPO URL'" --version="'0.0.2076-dev'" --prerelease
$exitCode = $LASTEXITCODE

Write-Verbose "Exit code was $exitCode"
$validExitCodes = @(0, 1605, 1614, 1641, 3010)
if ($validExitCodes -contains $exitCode) {
  Exit 0
}

Exit $exitCode

- name: Install sublimemerge
  win_chocolatey:
    name: sublimemerge
    version: '0.0.2076-dev'
    source: INTERNAL REPO URL
    state: present
    allow_prerelease: yes

See docs at https://docs.ansible.com/ansible/latest/modules/win_chocolatey_module.html.


chocolatey_package 'sublimemerge' do
  action    :install
  source   'INTERNAL REPO URL'
  version  '0.0.2076-dev'
  options  '--prerelease'
end

See docs at https://docs.chef.io/resource_chocolatey_package.html.


cChocoPackageInstaller sublimemerge
{
    Name        = "sublimemerge"
    Version     = "0.0.2076-dev"
    Source      = "INTERNAL REPO URL"
    chocoParams = "--prerelease"
}

Requires cChoco DSC Resource. See docs at https://github.com/chocolatey/cChoco.


package { 'sublimemerge':
  ensure          => '0.0.2076-dev',
  install_options => ['--prerelease'],
  provider        => 'chocolatey',
  source          => 'INTERNAL REPO URL',
}

Requires Puppet Chocolatey Provider module. See docs at https://forge.puppet.com/puppetlabs/chocolatey.


4. If applicable - Chocolatey configuration/installation

See infrastructure management matrix for Chocolatey configuration elements and examples.

NOTE

Private CDN cached downloads available for licensed customers. Never experience 404 breakages again! Learn more...

Package Approved

This package was approved as a trusted package on 11 Aug 2022.

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_2076_x64_setup.exe'
  checksum64    = '8a682cbe8eca4cd3ca508f812578a61edec5d6cbabae5265fee872615bb7d4e4'
  checksumType  = 'sha256'
  
  
  silentArgs	= "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-"
}

Install-ChocolateyPackage @packageArgs
tools\chocolateyuninstall.ps1
$ErrorActionPreference = 'Stop'
 
$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"
    }
}

Log in or click on link to see number of positives.

In cases where actual malware is found, the packages are subject to removal. Software sometimes has false positives. Moderators do not necessarily validate the safety of the underlying software, only that a package retrieves software from the official distribution point and/or validate embedded software against official distribution point (where distribution rights allow redistribution).

Chocolatey Pro provides runtime protection from possible malware.

Add to Builder Version Downloads Last Updated Status
Sublime Merge 0.0.2101-dev 246 Monday, September 16, 2024 Exempted
Sublime Merge 0.0.2100-dev 29 Wednesday, September 11, 2024 Exempted
Sublime Merge 0.0.2099-dev 97 Tuesday, August 13, 2024 Exempted
Sublime Merge 0.0.2095-dev 309 Friday, April 19, 2024 Exempted
Sublime Merge 0.0.2094-dev 67 Thursday, April 11, 2024 Exempted
Sublime Merge 0.0.2093-dev 34 Wednesday, April 10, 2024 Exempted
Sublime Merge 0.0.2092-dev 271 Friday, October 27, 2023 Exempted
Sublime Merge 0.0.2090-dev 175 Monday, August 21, 2023 Exempted
Sublime Merge 0.0.2089-dev 43 Thursday, August 17, 2023 Exempted
Sublime Merge 0.0.2088-dev 50 Wednesday, August 16, 2023 Exempted
Sublime Merge 0.0.2087-dev 46 Friday, August 11, 2023 Exempted
Sublime Merge 0.0.2085.20230518-dev 207 Thursday, May 18, 2023 Exempted
Sublime Merge 0.0.2085-dev 61 Friday, March 17, 2023 Approved
Sublime Merge 0.0.2084-dev 43 Friday, March 17, 2023 Approved
Sublime Merge 0.0.2082-dev 51 Tuesday, January 31, 2023 Approved
Sublime Merge 0.0.2081-dev 76 Tuesday, December 13, 2022 Approved
Sublime Merge 0.0.2080-dev 53 Tuesday, December 6, 2022 Approved
Sublime Merge 0.0.2079 1084 Monday, November 14, 2022 Approved
Sublime Merge 0.0.2078-dev 60 Wednesday, November 2, 2022 Approved
Sublime Merge 0.0.2077 1079 Tuesday, August 23, 2022 Approved
Sublime Merge 0.0.2076-dev 57 Thursday, August 11, 2022 Approved
Sublime Merge 0.0.2075-dev 69 Tuesday, July 26, 2022 Approved
Sublime Merge 0.0.2074 937 Friday, June 10, 2022 Approved
Sublime Merge 0.0.2073-dev 60 Monday, June 6, 2022 Approved
Sublime Merge 0.0.2072-dev 72 Tuesday, May 10, 2022 Approved
Sublime Merge 0.0.2071 793 Monday, April 25, 2022 Approved
Sublime Merge 0.0.2070-dev 81 Thursday, April 21, 2022 Exempted
Sublime Merge 0.0.2069-dev 74 Thursday, March 17, 2022 Approved
Sublime Merge 0.0.2068 1282 Tuesday, December 21, 2021 Approved
Sublime Merge 0.0.2063 679 Thursday, November 11, 2021 Approved
Sublime Merge 0.0.2059 1274 Friday, July 23, 2021 Approved
Sublime Merge 0.0.2056 892 Monday, May 17, 2021 Approved
Sublime Merge 0.0.2054 391 Tuesday, May 4, 2021 Approved
Sublime Merge 0.0.2049 712 Friday, March 12, 2021 Approved
Sublime Merge 0.0.2047 545 Tuesday, February 23, 2021 Approved
Sublime Merge 0.0.2039 990 Monday, November 16, 2020 Approved
Sublime Merge 0.0.2038 508 Friday, October 30, 2020 Approved
Sublime Merge 0.0.2032 739 Tuesday, August 25, 2020 Approved
Sublime Merge 0.0.2027 137 Tuesday, July 28, 2020 Approved
Sublime Merge 0.0.2025 576 Wednesday, July 22, 2020 Approved
Sublime Merge 0.0.2020 671 Tuesday, May 26, 2020 Approved
Sublime Merge 0.0.1119 1559 Tuesday, October 1, 2019 Approved
Sublime Merge 0.0.1116 540 Monday, June 3, 2019 Approved
Sublime Merge 0.0.1107 305 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