20 ms·

Show HN: Sublime Merge – A Git client from the makers of Sublime Text

• jskinner 8y ago
  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! Edit: there's also the announcement blog post, at https://www.sublimetext.com/blog/articles/sublime-merge https://www.sublimetext.com/blog/articles/sublime-merge
  • mmjaa 8y ago
    Hi Jon - great work - I've been a happy registered user of ST for years and I find it a wonderful tool in my productivity kit - so thanks! Will there be a home-brew cask for us on MacOS, by any chance?
    • nimeshneema 8y ago
      See this comment: https://news.ycombinator.com/item?id=18034241 https://news.ycombinator.com/item?id=18034241
  • adonese 8y ago
    I think i'll like this tool a LOT! Thanks for the great work! No single text editor in my life i love as much as sublime!
  • jazzyjackson 8y ago
    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 <a href="/https://www.sublimehq.com/store">purchased</a> Of course that leading slash will break things -- you could drop the whole `/https:` too.
    • jskinner 8y ago
      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.
  • coldtea 8y ago
    Totally appreciate your ST work Jon (main driver for 6+ years, used Vim before for 15+ years). Will definitely try Merge. Does it offer any integration with Sublime itself (e.g. if someone has a license for both)?
    • jskinner 8y ago
      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).
      • coldtea 8y ago
        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.
      • nicoburns 8y ago
        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!
  • sideproject 8y ago
    What! You guys are based in Sydney?!?!? Never knew that. Great to see my favourite tool being built in my city! :)
  • sammorrowdrums 8y ago
    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!
  • klageveen 8y ago
    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.
  • azag0 8y ago
    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.
    • jskinner 8y ago
      Oh yes! 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.
  • consto 8y ago
    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?
    • jskinner 8y ago
      Absolutely, I'll add it to the list.
      • nateweiss 8y ago
        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.
  • p0nce 8y ago
    Thank you. I use Sublime every day, and will for the foreseeable future.
  • neslinesli93 8y ago
    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?
    • jskinner 8y ago
      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.
      • the_clarence 8y ago
        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
        • jskinner 8y ago
          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.
          • porker 8y ago
            Are UI translations possible? If so, and someone can replace "Rebase" in the translation with another word, it's possible. Bonus if the other strings contain placeholders e.g. "Interactive #{rebase|ucfirst}" to reduce the changes. Bravo Jon, SourceTree has been sucking more and more recently, and as a Windows & Mac user I'm looking forward to trying this out.
            • the_clarence 8y ago
  • fishtopher 8y ago
    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?
  • levani 8y ago
    Do you have any plans to add a debugger GUI in sublime? Integrated git tooling and debugger is the main reason I use VS Code.
    • slifin 8y ago
      100% this, I have to switch between multiple editors because the ergonomics of sublime are too good but it's debugger is not Trying to migrate away using spacemacs but it's not going well
  • vmsp 8y ago
    Jon, it's impressive how you deliver incredibly performant cross-platform UIs. You really should consider talking about your development and custom widget toolkit. Great job on Sublime Merge.
    • interknot 8y ago
      Emphatically agreed. I've wanted to hear about this for years.
    • mixmastamyk 8y ago
      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. What am I missing?
      • mixmastamyk 8y ago
        Still no answers but a lot of malicious downvotes.
        • chipotle_coyote 8y ago
          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."
          • mixmastamyk 8y ago
            That leaves one poor performing toolkit, that has an excuse at least. Not hard to avoid apps written in it, in any case. Qt, Wx, Java, and many others don't or no longer perform poorly. So why the surprise there is one more? Maybe some folks don't know they exist.
    • boromi 8y ago
  • PJRO 8y ago
    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?
    • jskinner 8y ago
      Sublime Merge understands submodules, but we don't expose a UI for managing them yet. This is right near the top of our priority list though.
      • hwestbrook 8y ago
        +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. Other than this it looks great!
  • cwhiteley 8y ago
    Hi Jon, the app looks great. Does it currently support GitFlow?
  • sydd 8y ago
    Looks great! Is there any roadmap somewhere so we know what to expect in the future?
    • dsego 8y ago
      I see you haven't used Sublime Text. No roadmap, sometimes a few years go by without any updates.
  • mstade 8y ago
    Are you also moving Sublime Text to a subscription license for businesses?
  • ryan-allen 8y ago
    Hello fellow Sydney-sider! This looks amazing! If this is half as snappy as Sublime Text I reckon it'll be a winner! Good job Sublime Team! :)
  • owaislone 8y ago
    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?
    • maxymoos 8y ago
      There is indeed: I tried the same way as in Sublime Text and hurrah, it works. 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.
    • jskinner 8y ago
      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
      • owaislone 8y ago
        Thanks. That worked out perfectly!
  • jhasse 8y ago
    Any plans to switch from Gtk+ 2 to 3 on Linux? Scaling of native dialogs isn't very good with HiDPI displays atm :/
    • jskinner 8y ago
      I built a prototype of it at one point, but was running into performance issues trying to get pixels onto the screen. I'd like to revisit this, as the hidpi experience really is a lot better with GTK3.
      • openbasic 8y ago
        Wait... you use GTK on Linux? For what, exactly?
        • guessmyname 8y ago
          > 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.
        • deleted 8y ago
          [deleted]
        • jskinner 8y ago
          Menus and dialogs (open, save, error, etc) :)
  • alex_suzuki 8y ago
    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.
  • micnil 8y ago
    Great tool! Is it possible to get more than 3 lines of context in the diff view? Tried setting: git config diff.context 20 but this had no effect.
    • jskinner 8y ago
      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
      • micnil 8y ago
        Oh I see, that's probably more in line with what I want to do most of the time. Thanks!
  • vladdanilov 8y ago
    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). [1] http://www.sublimetext.com/~jps/animated_gifs_the_hard_way.html http://www.sublimetext.com/~jps/animated_gifs_the_hard_way.h... [2] https://getoptimage.com https://getoptimage.com
    • wbond 8y ago
      We built the animations using a slightly enhanced version of anim_encoder, which I currently have online at https://github.com/wbond/anim_encoder https://github.com/wbond/anim_encoder. One of the changes was adding pngquant which helped compress the images a bunch beyond pngcrush.
      • vladdanilov 8y ago
        You will get better results by swapping the two. Pngquant stops at color quantization. Also, most of those savings came from near-optimal Deflate compression.
        • wbond 8y ago
          Thanks for the tip!
  • guthriej 8y ago
    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?
    • jskinner 8y ago
      There isn't right now, but there will be a new build out soon that will work with this.
  • mescalito 8y ago
    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`. - Please add regex to the search :)
  • antaviana 8y ago
    I notice that seats can be changed any time in a Business subscription. Is the end of subscription recalculated each time you add or remove a seat?
    • jskinner 8y ago
      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.
  • faitswulff 8y ago
    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?
  • georgehaake 8y ago
    Thank you for the new cool tool. I'm hoping you could somewhat detail your custom UI toolkit used in these apps as they are consistently fast and uniform across platforms?
  • throwaway427 8y ago
    Hi Jon, 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?
    • wbond 8y ago
      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.
  • marmaduke 8y ago
    the light UI theme is great (as is the app itself), is there something similar available for ST?
    • wbond 8y ago
      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.
  • tombert 8y ago
    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.
    • guu 8y ago
      It has a similar model. Instead of the pop up you can't choose a different theme (ex: dark theme) unless you buy a license.
  • yumaikas 8y ago
    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.
  • robin_reala 8y ago
    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.
    • ryanmonroe 8y ago
      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.
    • rdco 8y ago
      For your third point, maybe try out Kaleidoscope (macOS/iOS only): https://www.kaleidoscopeapp.com/ https://www.kaleidoscopeapp.com/ You can map git difftool to it to launch it from the command line.
      • robin_reala 8y ago
        Hey thanks, that actually looks really good! Will try it now.
  • openbasic 8y ago
    Do you guys use OpenGL to render the UI widgets? Or do you use something more high-level like Skia?
    • saagarjha 8y ago
      Sublime Text uses Skia.
      • openbasic 8y ago
        Do you know if they tested alternatives, like Blend2D? https://blend2d.com/ https://blend2d.com/
  • zchrykng 8y ago
    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.
    • jskinner 8y ago
      Thanks for the kind words!
  • zyang 8y ago
    Is there a way to view history of a single branch?
  • 1st1 8y 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.
    • jimyl 8y ago
      That's definitely a brilliant idea. I wish Jon like this one.
    • n42 8y ago
      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.
      • arbie 8y ago
        And then they add Exchange support and the whole thing slows to a crawl.
      • AsyncAwait 8y ago
        Agreed. I would pay quite a lot for a native email client that respects your privacy.
      • codethief 8y ago
        I know that, in terms of UI, this is not precisely the SublimeText equivalent of an email client but have you taken a look at notmuch[0]? It basically operates on your local Maildir which you can keep in sync with your mail server by using a tool like OfflineIMAP[1]. [0] https://notmuchmail.org/ https://notmuchmail.org/ [1] http://www.offlineimap.org/ http://www.offlineimap.org/
        • unhammer 8y ago
          Or mbsync[1] – I've found it faster and more stable than OfflineIMAP. [1] http://isync.sourceforge.net/mbsync.html http://isync.sourceforge.net/mbsync.html
  • outcoldman 8y ago
    Hey Jon! Thank for building Sublime Text and now Merge! Long time user. 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.
  • flipgimble 8y ago
    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!
    • explainplease 8y ago
      > the ability to seamlessly search and filter branches by just typing the way most IDE's implement search for symbols or files. Magit does this in Emacs, especially when used with Helm.
  • davidcollantes 8y ago
    Would you consider adding both products (Sublime Text and Merge) in a bundle, say, at a lesser price?
  • nkkollaw 8y ago
    Why no love for hidpi monitors?
    • jskinner 8y ago
      We have hidpi support on every platform. 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)
      • nkkollaw 8y ago
        It's not, but I'm using both GDK_SCALE and QT_SCALE in /etc/environment.
  • eridius 8y ago
    Is there any official channel for feedback? 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?
    • jskinner 8y ago
      https://forum.sublimetext.com/ https://forum.sublimetext.com/ is the best place for feedback atm. 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
      • jazoom 8y ago
        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.
  • iamgopal 8y ago
    Any thoughts on open sourcing cross platform ui library that you have created ? Or even a paid version ?
  • desmondw 8y ago
    Thank you for allowing scrolling past the end. Seriously.
  • giancarlostoro 8y ago
    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.
    • recursive 8y ago
      Do one thing and do it well.
  • Tecuane 8y ago
    Looks like I have to be "that one", this time: Given there's a custom Git library in use under the hood, I don't suppose there'll be Mercurial support in the future?
    • shoyer 8y ago
      +1 for Mercurial support. I suspect there are enough Google and Facebook engineers using Mercurial to justify basic support :).
  • jazoom 8y ago
    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.
  • fizzledbits 8y ago
    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.
  • cknoxrun 8y ago
    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.
  • sscarduzio 8y ago
    Hi Jon! Thanks so much for this. Works amazing! I really like the look and feel of Text and Merge. What UI libraries do you use?
• _hao 8y ago
  How does it compare against GitKraken?
  • saagarjha 8y ago
    Well, for one, GitKraken is Electron while the Sublime tools are native C++. So I’d expect faster performance.
    • _hao 8y ago
      I remember something about Sublime being written in Python? Also I'm more curious about the feature set. The performance argument can be made again for Sublime vs VSCode. Doesn't matter to me because I've switched from Sublime to VSCode a long time ago. I care about features the most, not if the app will open in 0.5s or 3s
      • thune 8y ago
        Sublime Text plugins are written in Python, but the core is C++ AFAIK.
      • jazoom 8y ago
        I feel similarly and use VS Code, but GitKraken takes much longer than 3s to load on my desktop and it uses up to 500MB of RAM. Since I usually have it open with VS Code that's quite a lot of heaviness open at once. Then I've got several terminals open, a local Kubernetes environment, etc. Stuff adds up.
      • guessmyname 8y ago
        > I remember something about Sublime being written in Python? SublimeText is written in C++ with the "Skia Graphics Library" for the UI. It exposes an Python API to extend the functionality via 3rd-party packages. > I care about features the most, not if the app will open in 0.5s or 3s Opening is not the only performance gain you will get for using a software written with native libraries. You get faster overall operations in comparison with a program like GitKraken that needs to allocate several chunks of memory to execute simple tasks. It always baffles me when people use the startup time of a program as a mean to explain why they prefer using it over others. Electron-based applications are —overall— not performant. It's impossible to get good performance out of Electron because it sits on top of a web browser that is known to hug significant amount of memory from your entire system.
• CityWanderer 8y ago
  Super excited by a three-way merge tool, it's the thing I find most lacking in Atom and one of the great things about IntelliJ.
  • o_____________o 8y ago
    My favorite for clarity was always Meld: http://meldmerge.org/ http://meldmerge.org/
• indentit 8y ago
  Wow, Sublime Merge is so much smoother than GitKraken, great job! I love that it takes everything we know and like about ST and applies it to Git. It even seamlessly finds my Sublime Text packages, and uses the syntax definitions installed there for highlighting - no duplicate/double configuration required.
  • DigitalSea 8y ago
    GitKraken is a web-based application built on Electron, which is why it is slow. Same thing with Slack. What Jon and his team do is always build native and as you are probably already well aware, Sublime Text Editor performance is consistent across all operating systems.
    • petey283 8y ago
      Native apps ftw.
• harwoodjp 8y ago
  Is there a way to diff 2 branches?
  • FichteFoll 8y ago
    You can ctrl+click to select two commits (from different branches) which are then diffed against each other. You cannot select branches in the sidebar directly like this, however.
• skrebbel 8y ago
  My first impression is extremely positive. Many actions, particularly the kinds of actions that a UI can really help with, are unnecessarily hard in other UIs I've used. 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!
  • francislavoie 8y ago
    You can do that in GitKraken too btw, jump to file with Ctrl+P, "hist[enter]myfile[enter]". Or click on any recent commit, on the changes pane click "view all files" and you can jump to whatever file you want and see full history with right-click file history.
    • skrebbel 8y ago
      Cool! I was an early GitKraken adopter (and dropper), maybe I missed it or it simply wasn't in there at the time.
• anacleto 8y ago
  Looks very nice. Congrats on launching. Quite timely VS Code released this week: https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github&WT.mc_id=social-twitter3-sdras https://marketplace.visualstudio.com/items?itemName=GitHub.v...
  • softinio 8y ago
    This looks great. would love to see it in other editors.
• manmal 8y ago
  For my needs, GitX (rowanj fork) is still unbeat: http://rowanj.github.io/gitx/ http://rowanj.github.io/gitx/ It has the exact right amount of UI complementing the command line, and some delightful features, e.g. amending the last commit is possible via a checkbox below the commit message. 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.
  • dsego 8y ago
    Since you are on a Mac, did you try Gitup? I am disappointed that Sublime Merge didn't take clues from Gitup's interface. I feel it's the most unobtrusive and efficient git GUI to exist.
    • thekarel 8y ago
      Agree, Gitup is quite brilliant.
    • manmal 8y ago
      I‘ll give it a try!
  • egorfine 8y ago
    Latest commit ce17d07 on Nov 10, 2014 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.
    • manmal 8y ago
      Git Tower is not really better for my use cases. I‘ve tried various clients, Git Tower among them. I need UI only for file comparisons and line staging, and I find GitX‘s Layout perfect. GitX is again under active development (per another comment here).
• adamlett 8y ago
  For me the one and only GUI for Git, is GitUp: https://gitup.co https://gitup.co.
  • jatins 8y ago
    Yeah, I also compared against GitUp, which I use currently, and I think I'll be sticking to it.
  • klageveen 8y ago
    GitUp is cool, I particularly love the graph view. It has almost no functionality though. You can't three-way-merge and resolve conflicts in it, nor browse the file tree for any given commit, nor compare any two commits.
    • adamlett 8y ago
      True, it doesn't do everything, but it really hits the sweet spot for me. I wouldn't say that it almost has no functionality. To me, it has surprisingly much. It's just that it does such a good job of keeping the interface clean, that it can appear as if it doesn't do much.
    • asqueella 8y ago
      It is the only git client I know that makes polishing the commit history (i.e. moving commits around, splitting(!), rewording, editing) pleasant. If only it was available on Windows too...
      • explainplease 8y ago
        Have you tried Magit?
  • _jcwu 8y ago
    Mac Only...
• lordelph 8y ago
  One possible issue, I've got a file showing in "Untracked Files" which is not shown when do git status That aside, I like this a lot, and normally I only use the git command line.
  • sleepyhead 8y ago
    I had a bunch of files showing as untracked. Looks like Sublime Merge is not ignoring files listed in the global .gitignore.
• Serow225 8y ago
  Feedback: The first time I switched to the Search view, it was extremely non-intuitive how to get back to the main view. It took me a little bit to figure out that the main view is at Navigate>Go To Commit Changes. Maybe this selection could be moved below the divider so it's a little more obvious that it's related to the other options in that section? Or make the Search view an overlay kind of like Blame so there's a visual affordance suggesting what to click to back out of the view? It took me a good while to figure out that I could get from Search view back to Commit view by clicking on one of the Branches in the Location bar (and if you have that hidden then I don't think there's any GUI-click way to back out of Search view?). Hope this makes sense!
  • deleted 8y ago
    [deleted]
  • jskinner 8y ago
    FWIW you can also press the Search icon/key binding again to get out of it, or use the Back button on the toolbar. I agree that it's not at all obvious from a visual point view - I'll see what we can do.
    • Serow225 8y ago
      Thanks Jon! I'm really liking it so far, congrats to you and your team. Going to be sharing in an email to our dev group :)
    • Serow225 8y ago
      I think what made it a little less intuitive is that the very first time I got to Search using the menu dropdown instead of the Search Icon (at that point I hadn't even noticed that there was a search icon). If I had switch to the Search view the first time using the icon, it might have been a little more obvious to me that I could back out by clicking it again.
• hawski 8y ago
  Looks good. I like how most buttons have text labels instead those dreadful indecipherable icons that are so popular currently. In a way it looks like a successful mix of git-gui effortlessness with no nonsense gitk. I hate all those clients that have to grind all the time through their leaky abstractions. 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.
• davman 8y ago
  Looks great Jon, happy you are expanding the Sublime family. 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.
  • mstade 8y ago
    I'd pay cash monies for this! Particularly if it's cross platform.
  • nerform 8y ago
    Awesome idea. Cross platform fast terminal with nice tmux integration.
  • marsrover 8y ago
    This would be great.
  • FichteFoll 8y ago
    I would keep an eye out on alacritty. It's a blazingly fast gpu-accelerared terminal emulator for Unix (currently) written in rust. According to their 0.2.0 announcement post, where they added scrollback support, Windows is next on the Roadmap.
    • davman 8y ago
      Thanks, I think I'd seen this one in the past but had ruled it out due to no Windows support (at the time). Edit: Ah, also "doesn't have features such as tabs" ruled it out for me.
      • StavrosK 8y ago
        Alacritty isn't actually super fast, the author just opened three other emulators and decided to call Alacritty "the fastest terminal emulator on earth". Kitty is much more full-featured and super fast. I've switched to it and love it to bits. EDIT: Ah, it's not available for Windows, too bad. It's the best.
• TorKlingberg 8y ago
  I'm happy to see some innovation in diff and merge tools. I have been happy to pay for Beyond Compare. The diff and especially merge is so much better than the built-in tools. I absolutely hate doing a complex merge on the command line, or trying to edit the conflict files git spits out manually. 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.
• rakibtg 8y ago
  @jskinner We need a built-in console/terminal and better Javascript intellisense for Sublime text; I hope the Sublime Merge and Sublime Text will fit together perfectly. All the best.
  • frou_dh 8y ago
    This has already set a high bar for a terminal inside Sublime: https://github.com/randy3k/Terminus https://github.com/randy3k/Terminus
• BitterAmethyst 8y ago
  Hi Jon, On windows it treats .gitignore patterns as case-sensitive which differs from how git itself behaves.
  • jskinner 8y ago
    Thanks for the report, I'll get it addressed
• ngrilly 8y ago
  Is it possible to amend the last commit in Sublime Merge?
  • indentit 8y ago
    yes, there is a (dropdown) button on the right of the commit button
• looperhacks 8y ago
  This looks very interesting! But I don't know that the "Review Better" video is trying to show, maybe the playback is buggy, because all I can see is that the code panel is resized?
• Jonnax 8y ago
  Looking forward to trying this out. Sublime editor is incredibly fast.
• saagarjha 8y ago
  Very nice. Fast and responsive, unlike most of the Git clients I know. And the new preferences UI is pretty cool. 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?
  • jskinner 8y ago
    Custom themes are supported (although not in the evaluation version), however Sublime Text themes will need to be adapted to work in Sublime Merge: there's quite a bit more to the UI here, and the controls to target are quite different. Likewise with color schemes, as long as they define the new diff scopes, color schemes can be used, however none of the existing ones will yet. Syntax definitions, on the other hand, don't need any changes, and any you have installed for Sublime Text will be picked up automatically by Sublime Merge. 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.
    • edditoria 8y ago
      Cmd+T/1/2/... for tab will be great and it is one of main consideration for my workflow. Btw, nice work! Edit: Attach an image to explain why: https://twitter.com/Edditoria/status/1043481201443368960 https://twitter.com/Edditoria/status/1043481201443368960
• hex20 8y ago
  Wow this looks awesome. Maybe I can finally stop using PhpStorm for git and nothing else.
• keithnz 8y ago
  First impressions, it's quite nice, super snappy as promised. 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
• Serow225 8y ago
  Congrats! I know what I'm doing at work tomorrow :) Does it have gitflow support built in? Also just FYI the main page shows a "download for Mac" button in iOS Safari, I almost thought it was Mac-only until I went to the Download page. Maybe the front download link should autodetect the platform but also give you the option/drop-down to select another? Or at least make it obvious that it isn't the only platform. Cheers
• wingerlang 8y ago
  Feedback: - 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.
  • francislavoie 8y ago
    I think GitKraken does the user indicator best by using gravatar icons for each commit node on the graph. Much more compact way to show who's who. Can get confusing in very active repos but it's better than too much text on the screen
  • c487bd62 8y ago
    I can only get "Stage lines" for files I previously commited. 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.
    • wingerlang 8y ago
      Here is how it looks for me. https://imgur.com/a/qZprpJT https://imgur.com/a/qZprpJT
      • deleted 8y ago
        [deleted]
• Aldo_MX 8y ago
  No dark theme in the tryout version, that's evil. I love Sublime Text and I believe that Sublime Merge will surely do an exceptional job, but I love my eyes even more, so I'll pass this time.
  • ealhad 8y ago
    I think the point of a tryout version is to make you buy the software.
    • derefr 8y ago
      The point of a tryout version is to allow you to try the software, in order to make you buy the software. For some people (e.g. people who have delayed sleep-phase syndrome), a dark theme is essentially an accessibility requirement. They won't be able to try the software if it doesn't have it. Imagine a piece of software where the demo version doesn't have screen-reader support. Would that make sense? How do you expect a blind person demo the software?
      • ealhad 8y ago
        Well, I haven't tried the software, and won't, since I all my needs are already met and I tend to avoid proprietary software anyway. Nevertheless, I think this is a clever strategy from Jon Skinner and his team.
  • fyhn 8y ago
    Agree to this.
  • walkingolof 8y ago
    If you pay for it you get the dark theme, which is reasonable, people have bills to pay.
    • vitosans 8y ago
      make it demoware until paid, don't hold dark theme ransom I didn't even give it a shot once I saw that I deleted it.
• jgresty 8y ago
  > "The evaluation version is fully functional, but is restricted to the light theme only." They really know their target audience.
  • skrebbel 8y ago
    Also I think they learned a lesson from how many people simply grew a habit to click "cancel" in the "please buy this" reminder in Sublime Text.
    • polyvisual 8y ago
      I'm so lazy and it's too easy to click "Cancel"... I have a license but a year after re-installing ST I still haven't added it :/
      • badpun 8y ago
        Just search your inbox for "sublime license", and copy the license into Sublime. The whole operation takes me below 1 minute on a new machine.
        • mstade 8y ago
          It'd be nice if there was a command line option for this actually. I have my machine setup almost entirely automated, but this is one of the manual steps I have to do.
          • JorgeGT 8y ago
            As far as I know, it used to be just a matter of writing the plaintext license into the appropriate file: https://forum.sublimetext.com/t/license-installation-silently/13749 https://forum.sublimetext.com/t/license-installation-silentl...
            • mstade 8y ago
              Awesome – thanks for sharing!
• frou_dh 8y ago
  Bet there was some gnashing about how to name this. Sublime Merge makes it sound like it's in the established genre of general text diffing/merging application, rather than a git GUI. Regardless, personally very likely to use this!
• fyhn 8y ago
  This looks really good. I'm trying it out now, and my main immediate pain point is that there is too little visual separation between staged and unstaged files. A horizontal divider or a slight change in background color could be useful.
• chrisper 8y ago
  Is this made by the same team as sublime text?
  • zmix 8y ago
    How could you not see it ? ;-)
    • chrisper 8y ago
      It would not be the first time someone making a Show HN with a similar name to some other popular app / service.
  • ABS 8y ago
    it does say "from the makers of Sublime Text" in the title and on the page immediately under the title...
• modernerd 8y ago
  Looks great! I was using Fork before, but prefer the clean UI of Sublime Merge so far. 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
  • frou_dh 8y ago
    You could cut out the middleman by adding "/Applications/Sublime Merge.app/Contents/SharedSupport/bin" to your PATH.
    • modernerd 8y ago
      Makes sense, thanks!
• krupan 8y ago
  "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" 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.
  • nicolas_t 8y ago
    Completely agree, showing the common ancestor is extremely helpful.
  • jskinner 8y ago
    The middle pane is toggleable between the merge results and the base file
  • onion2k 8y ago
    A 3-way merge involves your changes, others changes, a common ancestor, and the resolved text. 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?
    • quietbritishjim 8y ago
      It's fair to take either opinion – personally I often find the common ancestor quite important, but I could understand why you might not. But it's disingenuous to call a tool "three way merge" if it's not shown. If you're only showing the two immediate parents, that's a regular old two-way merge.
    • pfranz 8y ago
      I actually just encountered this today. My changes, a large refactor, was trying to be reconciled with tweaks done before my refactor. Diffing mine against their's was gross. The first thing I wanted to see what their changes diffed against our ancestor looked like. 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.
• owaislone 8y ago
  Doesn't scale on HiDPI on Linux. Increasing font size only makes a part of the app readable and there is no zoom in/zoom out functionality that I could find. :(
  • jskinner 8y ago
    We pick up the default GTK dpi settings, and if that's not suitable, you can use the dpi_scale setting to set it specifically (you'll have to restart Sublime Merge after changing it though). I run Sublime Merge on high dpi screen under Linux every day FWIW.
• chrisper 8y ago
  I can't figure out how to configure SSH key or where to find a documentation for the settings file :( 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.
  • commanderjroc 8y ago
    I am getting the same issue. That exe file is not even in the directory for it.
  • jskinner 8y ago
    Sorry about that - I missed a part in our Windows installer, and ssh-askpass-sublime.exe isn't being installed. This will be resolved in the next day or two, in the mean time the portable version has it - https://www.sublimemerge.com/download https://www.sublimemerge.com/download
• b3n 8y ago
  How does this compare to Magit?
• mescalito 8y ago
  I will try it out immediately, but I am surprised GitSavvy[1] was not even mentioned in this thread. It's by far my everyday package, and it fits very nicely. It's the only thing in a way of really wanting this. [1]: https://github.com/divmain/GitSavvy https://github.com/divmain/GitSavvy
  • lttlrck 8y ago
    GittySavvy is excellent.
• kiechu 8y ago
  +1 for Stage Lines
• davidlartey 8y ago
  Hello Jon, congratulations on Sublime Merge. ST has been my preferred editor for as long as I can remember. 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?
  • jskinner 8y ago
    Git hooks will be run, as all mutating actions go through git itself, however pre-commit hooks may not work as you expect with this setup. When you commit via Sublime Merge, it's doing a git commit -m "...", which works differently with git hooks than a plain git commit.
• sjapkee 8y ago
  99$ for a git client. Nice joke.
  • darkstar999 8y ago
    You are a software developer who doesn't respect the value of good software?
    • sjapkee 8y ago
      It's not worth $99. Maybe $5, maximum $10. But not $99.
  • urda 8y ago
    Great software isn't free, it costs something along the way. If you think you can beat their price point, well there's clearly a market for it. Go for it.
• nik736 8y ago
  Since using Atom for years now I am not up2date in regards to Sublime Text. Does it have a Git integration, or is this the tool that should be used instead of a editor integration?
  • dsego 8y ago
    No built-in integration afaik. There are plugins to issue git commands and see line diffs in the gutter.
• commanderjroc 8y ago
  Hey Jon, Sublime Team. Is there a way to make the "Staged Files" view appear at the top of the tool? Preferably above "Working Directory" ?
  • jskinner 8y ago
    It's not configurable, but you can click on the "Working Directory" head to collapse all the files there, which will make seeing the Staged changes easier
• testcross 8y ago
  Looks like magit, without the very good editor integration that makes magit awesome. Seems nice tho.
  • fastball 8y ago
    Presumably as time goes on it will become more and more integrated with Sublime Text, which is arguably a "very good editor". Or is that not what you mean?
    • RX14 8y ago
      The beauty of magit is that the ui is just text, so you can navigate through the entire interface using just your keyboard without "shortcuts". Selecting lines to stage is just selecting lines in the diff like you'd select lines in the editing buffer. Its really nice and caters to power users, I don't know of anything else like it.
    • Nullabillity 8y ago
      Then it would presumably have been a feature of Sublime Text, rather than a standalone application?
      • fastball 8y ago
        Well, when I say "integrated with ST", I mean they will be integrated with each other. That way, I can be a power user of Sublime Merge while only using ST occasionally (because I'm more of a vim user), or vice versa (because I'm more of a magit user). Or you can be a power user of both. I think it makes sense in this case to have two applications. I personally am an avid user of ST, but I generally prefer the command line for git. However, there are some things that it's nice to have a GUI for when git'ing, so this is ideal for me.
    • Volt 8y ago
      Probably to be read as (very good) (editor integration) rather than (very good editor) integration.
• benwills 8y ago
  Straight to payment for me. Sublime Text is one of the few pieces of software I've just felt was done totally right at so many levels. Entirely happy to give you more of my money.
  • nateweiss 8y ago
    Same here. I expect to actually use SM, but even if I don't, happy to contribute a bit more to the folks who make ST (which I use all day, every day).
  • petey283 8y ago
    Same. Product already feels great and I'm ready to use exclusively full time.
  • jskinner 8y ago
    Thanks for your support!
• cpburns2009 8y ago
  Is it possible to use this outside of the context of Git? Such as diffing 2 different files or directories?
• KaoruAoiShiho 8y ago
  How does it compare to Fork? My currently favorite Git client.
  • softinio 8y ago
    Never heard of it before. It looks good. Is it really free?
    • KaoruAoiShiho 8y ago
      I certainly never paid nor have I been asked to pay. It works great for me. /shrugs
• isatty2 8y ago
  $99 for this? 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?
  • FraaJad 8y ago
    It is essentially free unless you want the ability to customize the colours. This is even more generous than SublimeText. Not even nagging popups.
    • jimyl 8y ago
      Nope, there are popups just like in ST. But good people will purchase a license, so that's not a problem, right? ;)
  • trishume 8y ago
    Sublime Text is close to being the only piece of perfect software. I have so much good will for the Sublime team that I'm tempted to buy it without even trying it. 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.
  • kitsunesoba 8y ago
    $99 is peanuts considering how much most devs make and it’s something that you’re likely to be using at least 5-7 days a week — even in the case of weekdays only (260 days/year), you come out at about $0.38/day. The sublime guys aren’t dropping major new releases often, either, so that $99 is likely going to last you for 2-3 years minimum, making the price even more incredibly cheap.
  • guessmyname 8y ago
    I make more than $99 per hour… So I just need to use this software for one hour to justify its price. If you cannot afford it, then just use the try-out version, which offers unlimited functionality.
• shusson 8y ago
  Looks nice but what I really want is a native client that works with github PRs. I know this was probably a design decision to remain a git client not a github one but still.
  • mattigames 8y ago
    It should have an option to install a Github-plugin for integration, maybe a bitbucket and gitlab ones too if feasible.
• ebgraham 8y ago
  How do I filter the visual branch view to only display the commits from the branch I've selected or highlighted? Fork has a filter icon for this, and Tower does this by default (preferred). My repo at work has a lot of branches and contributors so I really only want to see a linear history of my branch.
• softinio 8y ago
  Jon, 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.
• jarek83 8y ago
  Whenever I try to do something I get an error: xcrun: error: invalid active developer path (some path here), missing xcrun at: some other path here
  • saagarjha 8y ago
    Try running "sudo xcode-select -s /path/to/your/Xcode.app` in the terminal, or install the command like tools if you don't have Xcode.
  • jskinner 8y ago
    We use the system Git by default on Mac if it's installed, but it sounds like that's not working for you. If you set your git_binary preference to "bundled", we'll use the one that comes with Sublime Merge instead.
• softinio 8y ago
  First impressions I really like it. Excited to do my next merge conflict with it. Well done Jon and Sublime team.
• pdeva1 8y ago
  it would be nice to put a label to mark the 'HEAD' commit
• AltruisticGap 8y ago
  I was hopeful but for my simple uses, it doesn't work. 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.
  • AltruisticGap 8y ago
    Further thoughts: 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)
• edgarvaldes 8y ago
  >You can also hover over most buttons to see which git command it will run. I really like this feature.
• Scottopherson 8y ago
  I've been using Tower but I may switch to this since Tower switched to a subscription model and I'm a fan of Sublime Text.
  • n42 8y ago
    I feel the same. This is a better fit for me anyway. Tower seems to have doubled down on the "non-developer" type. I am perfectly happy to use git on CLI, but a visual interface for selective staging and merge conflicts makes things easier. This seems to really fit the workflow for keyboard power users (cmd+p menu, etc)
  • mistersquid 8y ago
    Like sibling commenter, I'm right with you because I am dubious of Tower's pay-to-play subscription model. 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-agenda-138a11995595 https://medium.com/@drewmccormack/a-cash-cow-is-on-the-agend...
• micnil 8y ago
  One thing I really miss with diff tools like this, is the ability to review multiple non-consecutive commits on a single branch, without including all commits in-between. 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.
• pkamb 8y ago
  I use SourceTree almost solely for its "Split View Staging" feature, where a line or hunk can be moved between the two states and the entire bit you're about to commit can be viewed independently of other working copy changes. 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.
  • dabernathy89 8y ago
    I've been pretty happy with SourceTree, despite a few minor annoyances. What missing features are you thinking of?
    • pkamb 8y ago
      The big one for me is deleting multiple branches! I want to Shift-Click to select a bunch, and then delete them. Doesn't work, despite several UIs in SourceTree where it should.
      • dabernathy89 8y ago
        Ok actually, yeah. That has been one of the biggest pain points for me too.
• derefr 8y ago
  I need to know: how long was the debate between naming this "Sublime Merge" and naming it the obvious alternative name: "Submerge"? (Mind you, I have a strong feeling that people are still gonna call it that.)
• vamshi4001 8y ago
  Awesome! This would be handy and can avoid the heavy sourcetree (atleast on windows!)
• asfaltboy 8y ago
  @jskinner can we run the 3-way merge tool from command line, i.e to set it as a `git mergetool` ?
  • jskinner 8y ago
    It's not exposed via the command line right now
  • codethief 8y ago
    Would love to have this as well!
• atombender 8y ago
  This looks pretty good! Maybe this is a good time to air some complaints about all of these Git UIs. 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 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 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.
  • PretzelFisch 8y ago
    I know this is for windows only but you might check out https://tortoisegit.org/ https://tortoisegit.org/ it has shell integration that lets you see what each files status. I think this is what your describing.
• amirmasoudabdol 8y ago
  Thanks for this really. I never understoon any of the Git Clients and I never has been interested to learning or using them. Sublime Merge is different though. It has enough UI, and you still feel in control. It makes sense.
• guessmyname 8y ago
  I hope the Homebrew team merges this soon — https://github.com/Homebrew/homebrew-cask/pull/52246 https://github.com/Homebrew/homebrew-cask/pull/52246 That being said, I already downloaded the DMG archive and have been using it for the last hour.
• deleted 8y ago
  [deleted]
• vitosans 8y ago
  I wanted to like this, downloaded opened and tried to change to the dark theme (you know same as my good old terminal) and you have to pay for it. rm -rf back to vi
• petey283 8y ago
  Already one of the best git clients out there. The snappy feel makes it a joy to go back in time and track the changes and understand more about the entire codebase. To me, this is an underrated element required in understanding the lifespan of a codebase.
• aogl 8y ago
  Beautiful as expected Jon, thanks. Your UI kit feels really nice, good job.
• bunwich 8y ago
  I installed the binaries in linux and it didn't automatically find sublime_text. This should help if you're trying to use another editor too. ~/.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"
• daveheq 8y ago
  "Evaluate for free" - dead
• tsumnia 8y ago
  I've only gotten to play with it for a short while, but does it handle GitHub Enterprise repos as well?
• zorkw4rg 8y ago
  Is there anything worse than having to develop with people who can only use Git via a UI? It pretty much by definition means they have zero grasp on the fundamental concepts of Git.
  • deleted 8y ago
    [deleted]
• kristianp 8y ago
  I really couldn't parse the article title: "Sublime Merge - Git, Done Sublime". I think the correct grammar would be "Sublime Merge - Git, Done Sublimely". 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.
• wingerlang 8y ago
  Another piece of feedback - 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.
• itsnotvalid 8y ago
  For direct integrations there is already a tool called Sublimerge (https://www.sublimerge.com/ https://www.sublimerge.com/) (I am not affiliated with this team), anyone compared the two? If it's a merge tool is not integrated directly with the editor, it's not as useful. 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.
• andig 8y ago
  Sublime Merge looks a lot like SourceTree from the approach it takes. Must say that I'm happy with SourceTree after having had a slow start...
• vicarrion 8y ago
  I would definitely love to have tabs for multiple repositories. Source tree on windows has this which is great for managing lots of different projects, but infuriatingly on osx sourcetree has one window for each project.
  • asqueella 8y ago
    Ctrl+Shift+O to switch repositories mostly works for me. 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.
• 7kmph 8y ago
  Finally, a decent git GUI for Linux. More please.