Edit: there's also the announcement blog post, at https://www.sublimetext.com/blog/articles/sublime-merge
Great job on Sublime Merge.
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.
What am I missing?
I am considering creation of EMail client, as a next step of my https://notes.sciter.com.
The Sciter Notes resembles email client UI pretty close, so UI portion is feasible in months time frame.
At the mean time I am doing html-notepad that has also close UI: https://sciter.com/html-notepad-new-kid-in-the-block/
If someone knows IMAP/POP/SMTP stuff and want to join or invest into the project - please let me know.
I believe it is finally the time to make convenient email client.
Been messing with it for a few minutes and it is awesome. Been looking for a good Sublime-like git tool for years.
Does it offer any integration with Sublime itself (e.g. if someone has a license for both)?
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).
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).
[1] http://www.sublimetext.com/~jps/animated_gifs_the_hard_way.h...
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?
1. You can setup two rulers via adding "rulers": [50, 72] to Commit Message.sublime-settings, which is available via the Preferences menu.
2. We don't have Swift syntax highlighting out of the box, but if you have it installed for Sublime Text, we'll pick it up
3. Thanks for the report, I'll investigate
- 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`.
- Please add regex to the search :)
EDIT - read the blog post and idly wondering if you would ever consider licensing Sublime's UI engine?
- 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.
https://www.kaleidoscopeapp.com/
You can map git difftool to it to launch it from the command line.
Trying to migrate away using spacemacs but it's not going well
Question about Sublime Merge, is it possible to use smerge as a diff tool without git?
Seems like it is not possible right now. Curious, if you are planning to add this in the future.
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?
I'd like to revisit this, as the hidpi experience really is a lot better with GTK3.
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?
What does that mean? Isn't git flow just a branching 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.
Given there's a custom Git library in use under the hood, I don't suppose there'll be Mercurial support in the future?
Sublime Merge is looking very responsive and cleanly organized. Great job!
Magit does this in Emacs, especially when used with Helm.
But PS, you have a broken link on the /download page
<a href="/https://www.sublimehq.com/store">purchased</a>
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.
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.
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.
Thanks for the great work! No single text editor in my life i love as much as sublime!
Go to Preferences > Edit Settings, then add a new setting to the dict: `"dpi_scale": 2.0` (or whatever float value works for you)
I think you need to restart Sublime Merge then.
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.
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?
Will there be a home-brew cask for us on MacOS, by any chance?
I'm hoping you could somewhat detail your custom UI toolkit used in these apps as they are consistently fast and uniform across platforms?
Is there any roadmap somewhere so we know what to expect in the future?
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)
Can I suggest Sublime Terminal as a possible addition? I'd happily pay for a decent terminal experience on Windows and with your cross platform toolkit it looks like you could deliver that. ConEmu et al just don't do it for me.
With the new Windows Console API we can assume, that people will start to use it.
I've been using it for many months now and it's been nothing but solid.
I spend 99% of the time using the WSL terminal, and every once in a while I run a PowerShell terminal too.
They are missing a pane then. A 3-way merge involves your changes, others changes, a common ancestor, and the resolved text. kdiff3, Beyond Compare, and very recent versions of emacs are the only tools that I've seen that present this properly.
That's true, but is it important to have all those things visible when you're resolving a conflict? The design of a UI should be driven by what the user needs to see, not the data that's being used. Most apps have absolutely loads of invisible data in the background making things work; that doesn't mean they need to be front and centre in the UI.
In my experience of resolving conflicts I can't remember a time when I've needed to refer to the common ancestor, so do I really want to give it screen space?
However, in the end I didn't end up merging any code and I haven't yet been in a position where this has come up much. I just thought it was a funny coincidence I encountered this earlier today.
This is what Araxis Merge did, or at least used to do when I used it, and I found it more useful than P4Merge's 4-way display (which just takes up more space than necessary).
It's possible there are types of merge where it's useful to have the common ancestor permanently visible, but I never seemed to run into them.
If I need a common accessor, I'll pull it up some other way (either via history tools or actually finding it in Github).
What I don't like about Sublime and now Sublime Merge, is the unusual way of setting preferences by editing files. I understand that hacking in a JSON file has benefits, but if you just want to use that tool, it's tiring having to google how to change a setting. To me, it feels a bit like losing control. E.g. I wanted to check whether SM supports line wrapping—I'm still not sure whether it does, after browsing the available menu items a bit.
Yeah, been there, done that. I have maintained a fork of GitX for my own usage with my own fixes but then gave up. Better clients exists. Right now I am using Git Tower and happy with it.
Or is that not what you mean?
They really know their target audience.
It was an excellent motivator. :)
- I would be nice to be able to remove the name inside the commit log. It's only me on this project and literally 50% of the lines (ever other) is my name.
- I would also like to have the option to split top/bottom like sourcetree, so that I can read the full commit message easier.
- The 'end of list' looks like a loading indicator
- 'Staging lines' only appear when I select something on the line (even one characer). It would be good if clicking in a line actually selected the whole line instead of adding a (unusable?) cursor
- The logo might want to have a shadow where the light and darker color meet. Right now it is looks kinda strange. The Sublime Text logo has shadows where two edges meet. That logo does 'fold' over itself though which this one doesn't. But anyway the color difference is strange on my eyes.
Maybe I'm doing something wrong but if I add a new file the only options are Delete or Stage. Or maybe it isn't implemented yet.
Eg most UIs have a good File History window, but often finding the appropriate file is a lot of work (and by often I mean at least SourceTree, GitKraken and GitExtensions iirc). Eg something like you need to scroll through commits until you found one that happened to have changed that file, then right-click the file, choose file history.
In Sublime, it's just Ctrl+P, fh<enter>myfilename<enter>.
I care about stuff like this (same for Blame, and Stage/Commit (which is usually done great though)) because it's the kind of thing UIs are great at. Both invoking the command and using the output is significantly easier and nicer in a UI than it is from the terminal. Eg it's way more important than an extended "Pull" dialog with all kinds of options I don't care about - I can do that just as easily from the terminal, and my editor probably has a button/keystroke for it somewhere too. So far it seems to me that the Sublime folks got their priorities right. Hats off, will probably purchase!
It even seamlessly finds my Sublime Text packages, and uses the syntax definitions installed there for highlighting - no duplicate/double configuration required.
Here's how to create a shortcut to the smerge command (Mac), which I didn't see documented anywhere:
ln -s "/Applications/Sublime Merge.app/Contents/SharedSupport/bin/smerge" /usr/local/bin/smerge
EDIT: Ok I found out it just takes the SSH key from ~/.ssh
But now it complains about C:\\Program Files\\Sublime Merge \\ssh-askpass-sublime.exe missing.
That exe file is not even in the directory for it.
Sublime Merge implements cash cow subscription (paid license works in perpetuity and grants updates for a specified time period). [0] This is more acceptable for those concerned about losing access to tools due to an expired license.
Cash cow licensing provides a good balance between the developer and user where the developer has strong incentive to actually improve the product and the user the power to decide if paying for an updated version is worth it.
With pay-to-pay, one's tools are effectively held hostage regardless of the value of available updates.
[0] https://medium.com/@drewmccormack/a-cash-cow-is-on-the-agend...
The approach of every single Git app that I've encountered is to present the history as the entry point to working with a project. Maybe I'm a weirdo, but that's not how I primarily work with git, and while having such a history view is critical, I'd like a tool that actually doesn't do that as its main mode of operation.
Instead, I'd like a tool that has a file-oriented approach. Which is to say that it should show uncommitted changes as a file tree browser that either shows the entire tree (with icons, colours or whatever to indicate what is changed) or the subset which has changed. This should be a tree browser where you can click on a single file to view its diff.
The other thing that these Git apps do badly is diff display. Sublime Merge can be forgiven for doing a simple colourized vertical view in its first public release, but other tools can't. The best diff browser I've seen is Eclipse (which I haven't used in a decade, but still miss at times), which coincidentally implements the same UI metaphor. Take a look at this screenshot:
https://i.ytimg.com/vi/-Jdu__jEnFw/maxresdefault.jpg
Note the left pane, which is the file tree. It's only showing changes.
Note the top right panel, which shows a semantic change tree of your file. If Eclipse understands the structure of your file, then it can show the changes by class, method and so on. It's really nice.
Thirdly, note the diff view, which is a side-by-side view which is visually really good at correlating blocks of changes. Many side-by-side differs will keep the two views vertically synchronized by inserting blank space. Not Eclipse! There's no blank space; instead, Eclipse uses the Bezier lines to indicate which block on the left side corresponds to the block on the right side, and these lines are updated as you scroll. Here's a video from someone using the UI:
https://youtu.be/KfeqnernMmE?t=807
Eclipse isn't/wasn't a beautiful app, but it nails the diff view.
The important thing is that you don't get the entire project diff in a single view, which is what Sublime Merge does if you go into either the "unstaged files" panel or a commit, but you get a concise file overview, and only see the diff for one file at a time. Doing it the way I describe above doesn't preclude being able to see the diff for a whole tree in a single pane, but it shouldn't be the default.
This is why I use SmartGit. https://www.syntevo.com/smartgit/
It has two perspectives, 'Main' and 'Review'. For each perspectives, you can configure different 'windows' to be shown/hidden. Window types are 'Changes', 'Journal', 'Branches', 'Git Output' etc.
For the Main perspective, I configure it to show me History + Remote/Local branches + 'Git Output'. This is when I want to interact with the remote repository.
For the Review perspective, I configure it to display the Files/Folders and Changes. You can configure the 'Files' view to show 'modified' files on the top, review the differences in 'Changes' section below and do quick commits.
Yes, the above is not as nice as Eclipse being able to display semantic changes but it's a very nice workflow and have not found anything better.
If you think you can beat their price point, well there's clearly a market for it. Go for it.
I use gitg in a on Ubuntu VM, also known as "GitX" on Mac.
The basic UI of gitg is much easier to read and browse, the commits and details are top/bottom instead of left right. With SM, I have to expand the window a whole lot more sideways to be able to read the commits. Also with SM my name is under each commit.. but since I work mostly solo, it's added noise that makes the list more difficult to read (what with the commit messages and the author name underneath practically same font size. here the gitg top/bottom layout means the author names and dates can go in other columns making the commit list easier to scan.
In gitg I have a quick view of what files changed, how much they changed, I can dive in if I want to see the actual code. With SM it seems by default you get a full spread of all the changes across several files.
Lack of separation in general, lots and lots of text floating in space with few lines or separation. Lots of subdued color. Buttons that don't look like buttons.
That said my use case is fairly simple. I work mostly on local repos, so for me gitg is a convenient way to see what I was working on last time, and to stage changes in meaningful commits. I don't need it to do a bunch of other things.
The merge sounds great though.. I really miss that... but as it is SM lacks contrast and readability for me.
Hopefully constructive feedback.
With gitg, I click on any commit and I can quickly see the files changed by that commit, then I can click to dive and see the actual code changes.
In SM by default there is a full spread of the modified lines. That's not as helpful since I have to scroll vertically , potentially a lot in order to see what other files were edited. There does not appear to be a "collapse all" by default option.
Though even in this collapsed view it's not very informative. In gitg there is a really simple red & green bar visual to see at aglance how much changes there are in each files. Thus when you epxlore a git repo, or review what you worked on weeks before;. it's easier to get a sense of how much things go into each commit.
With that said, it's a very slick client that obviously does a lot more than Gitg/gitx... I used SM today to edit an old commit message, which was simple to do.
The merge is probably awesome but I'm not sure how it works.. what if I mess up a rebase from the commaand line, will it let me continue the operation through SM or did I have to start the rebase / misc through SM first? (I ask because typically you had to configure the merge tool in the git config so I'm not sure how SM would catch that)
A couple questions:
* Can I add custom themes from my Sublime Text installation? How about color schemes?
* Are there plans for plugin support?
* Is there a development channel?
* Have you thought about adding tabs?
* Have you considered showing previews of binary files?
Plugin support is on the roadmap, and tabs will be added if that's what the user feedback asks for.
There's no dev channel yet, but we'll be adding one soon.
On windows it treats .gitignore patterns as case-sensitive which differs from how git itself behaves.
Fits my mental model so well, but is apparently considered too complicated for most other git clients such as GitHub Desktop and Tower.
From the animation, Sublime Merge seems to have Staged/Unstaged areas? Will definitely try this out, as SourceTree is otherwise bloated, slow, and missing critical features.
Quite timely VS Code released this week: https://marketplace.visualstudio.com/items?itemName=GitHub.v...
I'm trying out Sublime Merge, but it seems my git hooks aren't been called. Am I the only one experiencing this? A feature or a bug?
If only SM remembered the exact view that was open in the repository you re-open and made the name of the currently open repo more prominent - I would be happy to give up the visual tabs.
That aside, I like this a lot, and normally I only use the git command line.
I run Sublime Merge on high dpi screen under Linux every day FWIW.
Is there a way to make the "Staged Files" view appear at the top of the tool? Preferably above "Working Directory" ?
When there's git cli, magit, fugitive (which you should be using if you're really really in need of a GUI (and which is also better than whatever the demo is showing))?
I'm all for paying for your tooling if you can afford it but overcharging much?
I don't think the prices are comparable to other software since this will be a qualitatively different software-using experience.
I think people often underestimate in general how much really good software is worth. Most software I regret paying as much as I did for but I would pay at least $300/year for Sublime and likely more if that's what they charged. Dash is another good example of software I get way more value out of than what I paid.
But, Beyond Compare doesn't really integrate with git. You can set it to open for 'git difftool' and 'git mergetool' of course, but that's it. BC isn't well integrated with the Linux desktop either, not even the clipboard.
Has anyone here tried both Beyond Compare and Sublime Merge or an other new tool? What keeps me using BC, despite its flaws, is the core diff and merge algorithms. It just does a better job of showing what actually changed, and lets me manually align code when necessary. The suggested merges are very often right too.
However I'm still waiting for a client with graphical presentation and manipulation of git's DAG. Other than that I get by with CLI, git-gui (I would only wish to be able to edit files in it sometimes) and gitk.
(Mind you, I have a strong feeling that people are still gonna call it that.)
That being said, I already downloaded the DMG archive and have been using it for the last hour.
~/.config/sublime-merge/Packages/User/Preferences.sublime-settings
{ "editor_argument_format": "${file}:${line}:${col}", "editor_path": "/home/<user>/apps/bin/sublime_text" }
or if sublime_text is in your path.
"editor_path": "sublime_text"Example, lets say I want to review commit A and D: HEAD - A - B - C - D - E...
In most diff/review tools, when I select these commits in the GUI, it would show me all changes that have been made in commit A, B, C and D. What I actually want is for the viewer to filter out or atleast distinguish between the changes made in commits I selected, and the commits that are made in-between (in this case, B and C). This could of course lead to conflicts where the commits in-between have modified the same lines of code, but I really don't think this is a problem in 99% of the time.
This would really help the review workflow in scenarios where branching and pull request are not always used.
Too often, I have put down the time to review a single commit, only to find out that the next commit in the same task already fixed the things I noted in the first. reviewing both of them at the same time would save a lot of time.
That aside, I'm about to try it out. Looking forward to a less CPU intensive git client than Sourcetree. So tired of the constant flickering of the unstaged files view in Sourcetree.
On a side note, the competition for this sector of market, for sublime and such is much tougher, like atom and vscode being "free" to use. The one thing that hinders definitely, is the amount of third-party packages available.
I normally use SmartGit, which is also quite snappy, though is a bit clumsy with its windows. But I think SmartGit still has quite a bit of an edge when it comes to presenting diffs and the branching history at the moment.
I'll give it a go for a bit though and see if it grows on me
My repo at work has a lot of branches and contributors so I really only want to see a linear history of my branch.
Well done Jon and Sublime team.
To me, this is an underrated element required in understanding the lifespan of a codebase.
Regardless, personally very likely to use this!
- When I stage my lines, it is not obvious where the actual staging is as it just seems to disappear. In SourceTree there is a very clear 'split view' between the change and staged files.
I am excited about this and have downloaded it.
This product aside I really like sublime text so hope you have a positive roadmap in mind for that too.
I really like this feature.
Your UI kit feels really nice, good job.
Sublime editor is incredibly fast.