Hi HN - Jon Skinner here, I made Sublime Text and Sublime Merge, alongside the rest of the Sublime HQ programming team - Will, Dylan and Benjamin. Let me know if you have any questions!
Jon, it's impressive how you deliver incredibly performant cross-platform UIs. You really should consider talking about your development and custom widget toolkit.
I've never experienced a non-performant cross-platform UI.
Well, to be honest I've heard of folks complaining about Electron apps, but are easy enough to avoid. Oh yeah and Swing was a bit sluggish… in the 90s.
Allow me to somewhat quippishly rephrase your original post: "I've never heard of badly performing cross-platform apps, except for the ones written in what's currently the most popular cross-platform toolkit and the ones written in one of the most popular cross-platform toolkits a generation ago."
Jon, if you're looking for ideas what to work on next, please consider creating an email client. With fast UI & search, tree view for emails, proper support of plain text emails etc.
This is one of those things that I didn't know I needed. An email client made for power users with the speed, simplicity and flexibility of Sublime Text (and now Merge) would be the end of all of my email woes. I would pay a lot of money for this.
Mailspring looks nice. I would like the metadata to be under my control and not synced to their servers. The fact that I need to login to their machines turns me off. I'm open to running my own instance of their server. I do not like requiring "the cloud" to use my email client.
I'm going to assume you meant you could start in a month, rather than be completed in a month, because otherwise I'd like to save you some pain!
I wrote a mail client, two actual, focussed upon the console. (Think "scriptable mutt".) Writing a mail-client is hard. Partly due to the sheer amount of bogus mails you'll get, and partly due to people having very firm beliefs about what they want.
The user-interface is the easy part. More important is to design how you're going to work - Originally I allowed something similar to google's tagging, so you could "open a folder" which contained mail from multiple Maildir collections. It was not a success.
Using a database to store your state is a cheap alternative, but risks issues getting outdated if you ever interact with the mail outside your program. You either have to force an "indexing" step - like notmuch does - or scan the filesystem tree. Neither of those approaches are great, for obvious reasons.
(Also God help you if you want to work with remote IMAP servers. Standards? What are they!)
I only recently learned about sciter, and was pretty excited to start using it on a personal project. Thanks for that!
I'm not exactly an expert on imap/pop/smtp, but I'd potentially be interested in helping depending on what your plans are for it. Honestly I'd be happy to help with any new privacy-focused e-mail client that has a convenient ui.
I almost purchased before downloading it just because of how much I trust you and your team to make high quality software, and as a way to throw more money in your direction.
Been messing with it for a few minutes and it is awesome. Been looking for a good Sublime-like git tool for years.
Thanks for the kind words! There's some basic integration now, and we'll be adding more in the future.
Right now, Sublime Merge will pickup installed Sublime Text packages (e.g., for syntax highlighting), and will also find Sublime Text when you choose Open in Editor from within Merge (this can be customised to something else though, of course).
It would be cool to have some integration going the other way. In particular I would love:
1. If Sublime Text could detect when a directory is a git root directory, and present a button to "open in sublime merge" (my sublime projects often span multiple git repos, so detection on a folder by folder basis would be key). The ability to configure this to use another git client would make sense, although personally Sublime Merge looks fantastic.
2. A create commit action accessible from the Command-Shift-P dialog. I imagine Sublime Merge launches pretty quickly, so this would be pretty nice as I wouldn't have to keep it open: I could just let Sublime Text manage my "workspace". I currently commit using the terminal (+ Micro Editor), but this could be even better. Note: I notice that there is no "Stage All" button. That would be useful...
Aside: IMO managing workspaces/projects is a weakness of Sublime Text atm. I have tendency to move directories around which makes managing projects a bit awkward. I've resorted to opening sublime from the terminal with `cd /path/to/project/; subl .`. Not sure I have any specific suggestions for improvements, but that welcome screen in Sublime Merge sure looks nice...
2. Merge tool integration for file merging/diffing (e.g. if two files are selected in the sidebar, you could right-click > diff files, and perhaps an action on an open file could be "diff file with..."). There are plugins for Sublime Text that try to do this with two text panes, but they don't work especially well. IMO there aren't very many good diff tools, so a lightweight one that works cross-platform could be a good market to target.
Thank you for Sublime Text. I've used it almost every day for work for the last 5 years and it's definitely made my life much easier!
We'll 100% be adding integration in that direction too. A new build of Sublime Text shouldn't be too far off, there are some nice thing's that we've added into Sublime Merge (e.g., an update theme system), that I want to roll into Sublime Text.
With regards to Stage All, we don't have a button, but we do have a key binding: Command+Shift+A to stage all Modified files, and then press it a second time to stage all Untracked files, if desired.
Speaking as the sublime-text-git person, something with official deeper integration would honestly be appreciated. There's a few common UI requests which something official would probably pick off as low-hanging-fruit but which are basically impossible with the current API. :D
Just asking software engineering perspective, would be better to have the code that integrates Sublime Text <-> Sublime Merge as plugins? As in, the same Python plugin system that ST3 offers today?
This a million time. With VSCode being more popular than sublime text now, not having first class git integration just after installing sublime text is a serious reason not to use it.
Thanks, the fact that they can share packages (and eventually maybe themes) sounds great.
If it's possible, I'd also like some auto-sync mode (e.g. when a folder with a git repo is opened/active in sublime text, have sublime merge automatically switch to that).
Eventually, perhaps Merge can just be an extra tab (or something similar), inside ST, for people with both licenses.
Nice to see you're using the same animation technique [1]. MP4 could not possibly provide this level of quality/size (~150KB per animation).
Pngcrush is rather limiting though. I could compress the PNG textures by ~8% more with optimage [2] (I'm the author).
And for newer browsers, serving the textures as brotli-compressed BMPs would actually make them >30% smaller (probably more with filtered but uncompressed PNGs).
We built the animations using a slightly enhanced version of anim_encoder, which I currently have online at https://github.com/wbond/anim_encoder. One of the changes was adding pngquant which helped compress the images a bunch beyond pngcrush.
I just opened this on my repo and there's 3 immediate things I noticed:
1. The commit message UI sprouts a subtle 72 column marker when I put text in it, which is nice. But what it's missing is the even more subtle 50 column marker that I expect for the first line. Standard git commit style says the first line should try to be shorter than 50 chars because it's frequently shown as a summary and you don't want it truncated. Other tools like GitUp and GitX handle this nicely.
2. The diff view doesn't seem to have syntax highlighting for .swift files. I see highlighting for Tcl and Obj-C so I can confirm it's highlighting in general, but nothing for Swift. This is a rather surprising omission.
3. I can't actually commit using this app at all, because it seems to think I have no configured user details. Trying to commit pops up a dialog for me to set it either globally or locally. But I do already have it configured globally. In fact, I have it configured globally twice. I have it first in ~/.git/config, and then I also have it overridden in ~/.git/config.local, and my ~/.git/config has an [include] section that specifies `path = config.local`. I'm wondering if Sublime Merge is getting confused by that include and throwing away my entire global config?
On the topic of setting the user details, that UI element stretches across the entire width of the area, right up until the "Nothing to commit" button. A few times I clicked in that "empty" space to close a dropdown menu and was wondering why the "set user details" dialog popped up.
Looks very nice! Two things I noticed right out on a projet:
- It doesn't seem to be picking up my global .gitignore file. I see untracked changes of something that should be ignored. It doesn't appear on any other git client nor `git status`.
I often commit in a detached HEAD state (primarily because we're using Gerrit, and git-review sort of encourages it). Sublime Merge won't let me commit without being on a branch. Is there any way to get around this?
The search functionality looks great - I didn't even know that was an issue because I generally know how to dig through commits, but having a simple and fast UI for doing it might tip it over into the "must have" category.
EDIT - read the blog post and idly wondering if you would ever consider licensing Sublime's UI engine?
I work a lot with repos with very long line lengths (regularly up to 10k characters) and have to often check and merge multiple changes per line. I really like Git clients that can do one or all of these things:
- Block a small threshold of vertical scrolling when scrolling horizontally on a trackpad to stop the current line I‘m tracking wavering up and down as I scroll.
- Highlight whether there are further changes on the same line in some way (e.g. Git Fork starts a highlight at the first change and stops it at the last).
- Allow some sort of merge comparison with word wrapping turned on (I‘m yet to find a client that does this).
If you can get the first, and one of the second or third in, then I‘ll happily pick up a Sublime Merge licence to go with my Sublime Text one. I do understand that this isn‘t a typical merge environment, but I’m editing ebooks with long paragraphs.
Sounds like it might be easier to just write a program which inserts line breaks after periods (and one to remove them), so you can edit the books in their typical format and export to "git format" to deal with versioning/branching/etc. Although it sounds like you've been doing this for a while so there's probably some reason this wouldn't work which I don't know.
Had a little play with it and it's looking really promising. I'm probably going to stick to the terminal for simpler stuff, but this tool will definitely help pry me away from Gitlab, and the merge conflict resolution feature looks so much better than my current workflow.
I have a question, or rather a request. As a long term Sublime Text user I like to hide the menu bar which you can't seem to do in Sublime Merge. Would you consider adding this in a future release?
While you are fielding little requests, I'd personally like to be able to collapse/expand the areas in the "Location Bar" pane/drawer on the left (where branches/tags/stashes are listed). For instance, I often have a lot of local branches and would like to be able to focus on them rather than the remote branches. As it stands there isn't much vertical real estate for each of the lists, and there doesn't appear to be a way to resize/collapse them. SourceTree on Mac treats these as collapsible in an accordion-like way, which I personally like, but I'm sure there would be other good approaches too.
Not a huge problem because there's the cool branch list/switcher at top center, so maybe will find myself working with the Location Bar hidden mostly.
Hi Jon, we currently use Gitkraken, which allows us to manage submodules. I can't seem to find this functionality in sublime merge, do you know if this is something you guys have thought about and if it will be released any time soon?
+1 on this. I use Tower which has really nice submodule support.
In demoing Sublime Merge — if I move branches that use a different submodule or different submodule version, I get uncommitted changes, either a folder where the submodule was or commit change on submodule.
> Wait... you use GTK on Linux? For what, exactly?
SublimeText uses "Skia Graphics Library" to draw the entire user interface.
However, you still need to write Cocoa for macOS components and GTK for Linux.
Many cross-platform programs do the same, developers use a high-level library to render the overall interface, but underneath they are still using the native graphics libraries offered by the operating system where the program is running in, in this example, macOS and Linux. You can still do a lot with Skia alone, but eventually you'll find yourself writing some platform-specific custom code.
What are the chances of being able to "switch mode" from Sublime text itself? What would be killer for me is to do some work, and then jump to this view to commit / review changes / pull in other changes - I appreciate that it's a very different mode, but the integration would really help. Looks great so far!
Awesome stuff, I'm loving it! I guess it's time do finally ditch GitKraken and SourceTree (:
I have a couple questions:
- Do you have a plan to add git flow integration? And what about interactive rebases?
- Please, please, allow free users to use dark theme as well! Sublime Text license was really great, why add such a small change?
Interactive rebase is absolutely coming (you can already edit commit messages and squash commits). UI support for Git Flow is going to depend on user feedback. I expect we will eventually, but even if not, we will be adding a plugin API, and it would naturally be doable via that.
Also, if you can rename all these opaque commands to be more user friendly :) even if this means adding more commands, I think it’s worth it. “Rebase” should be the first victim
Alas, one of our key principles is to not hide or rename anything in Git, so your knowledge from using Git on the command line transfers to and from Sublime Merge.
Fair enough, maybe think of this as an optional feature for the future :) you must be really good with git but most people need to google how to do something everytime they want to do something more complicated then a merge
Personally, I believe letting every UI or toolchain compatible with git settle on their own phraseology for identical operations will lead to more issues than we currently have. Git is definitely complex, flags unclear, and commands awkward from time to time. Now, imagine trying to figure out the meaning of commands when they don't even translate equivalently across tooling? Sounds like a nightmare to me. I appreciate the effort to stay consistent with git itself.
I have to pay for a dark theme? seriously? You should sell features like in-app-purchases then. $1.99 for this, $.99 for that, etc. $80, $99.... man your software is really really good, but when there's free competitors that are on par w/yours, those prices are steep imo. I know you've heard all this before... guess the hundred dollar dark theme got me
I might be inclined to agree with you, but it seems to me it's not a $99 dark theme as much as it is an unrestricted trial version that you should buy for $99 even if you continue using it with the light theme.
I think it's actually good of the developers not to impose DRM, but it seems that confused you into thinking this is free software?
Just to be a bit annoying; I know a ton of people that download SublimeText and just ignore the little thing saying "Sublime is licensed software please pay", though I find that long term it does lead to them getting their employer to pay for it. Is SublimeMerge going to have a similar model?
Just a sidenote, good on you for keeping SublimeText fast and optimized. There are way too many systems out there that have moved to the "put every single application ever inside a self-contained chrome". I usually recommend Sublime before I recommend Atom because of this.
Pretty amazing feat to enter what looks like a saturated market with a product that has a a unique combination of features, is super performant and cross platform. Kudos.
The one killer feature I'm hoping some GUI client implements is the ability to seamlessly search and filter branches by just typing the way most IDE's implement search for symbols or files. I work on large active projects that use git flow and inevitably there are dozens of branches. Sourcetree in particular is slow and painful in this scenario and I would love to replace it.
Sublime Merge is looking very responsive and cleanly organized. Great job!
Allo, looking forward to trying it. One question for you, could you compare it to other standalone git merge options? What don't the competitors do that you do?
But PS, you have a broken link on the /download page
Sublime Merge is a Git client, and I'd list the main advantages over the alternatives as performance, and UI polish in general.
For example, when you stage a file in Sublime Merge, we internally predict the resulting change to the repository, so the changes are reflected in the UI immediately, while the operation is actually happening asynchronously. In contrast, other Git clients can take seconds before being able to stage a second file.
Hi Jon, I just tried it out and I really love it. 20MB of memory, super fast, intuitive to use. Tick, tick tick.
There's just one thing I found really annoying and it's that the window doesn't remember where I snap it to (Windows). Every time I open it I have to snap it to half my display again. GitKraken (and as of a month ago, VS Code) remember where they belong.
Hi Jon, amazing work! I am happy to try this out as I'm starting to get annoyed with SourceTree, it often hangs on me.
Is there a way to delete a local tracking branch and its corresponding branch on the origin in one operation? I often use this when cleaning up old branches that have been merged into the main development lines.
Congratulations for launching another promising product Jon. I tried it on Linux and couldn't figure out a way to scale the interface on a higher resolution screen. Increasing the font size only scales half of the UI. Is there any hidden setting to scale or zoom in/out?
You can use the dpi_scale setting for this in Sublime Merge and Sublime Text, but you'll have to restart after changing it. You'll need to edit the JSON settings directly for this (via Preferences/Edit Settings), and then set dpi_scale to something reasonable, such as 1.25
Hi! I love sublime and I'd love to use this too, but.. it crashes 100% of the time for me, whether I open an existing repo or create a new one. Is there a crash log or something I can send to you guys?
Any plans to implement interactive rebase in some way? Right now I'm heavily dependent on GitUp, where things like swapping commits or squashing them is often a matter of a single keyboard shortcut.
We do have some basics in there right now, you can directly edit commit messages and squash commits without any fuss. Full interactive rebase support will be coming later.
Hello Jon, I bought Sublime Merge a few days ago and am excited to see Dark Mode, but the key does not work. I sent in an email to support but I haven't received a reply. Sorry for nagging you, I realize you are probably all busy over there, but I'm super excited about this. Sublime Merge so far is the _perfect_ git client I have been waiting for.
My one question why was this made into it's own thing and not integrated into Sublime? I sort of would love to see Sublime have a bit more power, I can only assume it would start to consume too many resources? It'll be interesting to see what else you guys make. I really hope you consider making SublimeMail as others suggested.
Where are the various options and the like documented?
I'd like to add a custom command for pulling a specified branch from a remote, and given the extensibility of Sublime Text, I think there's a way to do that, but I'm not yet sure how to find it all?
Also, count me as a vote for a high performance Sublime Terminal. I'd pay for that in a heartbeat.
One feature that's missing from most of the git clients I use is the ability to do "branch1...branch2" diffs, ie, diff two branches from a common starting point but only show the new changes in branch2. Do you think this will be possible in Sublime Merge at some point?
If you select two commits in the commit list, it will diff between the two. Currently there isn't a super-easy way to jump to a branch while leaving the previous one selected, but we have some ideas on enhancing some of the process of jumping around the commit list.
Some feedback: I have a project containing a large (multiple MB) text file. Running Ubuntu 18.04. When there is a change to that file, Sublime Merge's UI becomes fairly unresponsive, with many actions taking multiple seconds to complete.
The billing period isn't changed, instead a pro-rated amount is changed. For example, if you add a seat half way through the billing period, you'll be changed half the normal amount for it. Reducing seats will result in a pro-rated credit on your next billing cycle.
You can drag the top or bottom of a diff to see more context at any time, but there's no setting to change the default number of context lines - I'll add a note for it
The light theme uses the Breakers color scheme from Sublime Text 3 for the editor controls. Many of the other colors are pulled from the Default theme in Sublime Text. This includes the colors of the commit list which is based on the side bar in ST, and the command palette.
If your dpi scale isn't being detected correctly on Linux, you can set it explicitly via the dpi_scale setting (there are instructions elsewhere in this thread)
Edit: there's also the announcement blog post, at https://www.sublimetext.com/blog/articles/sublime-merge