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.
Show HN: Sublime Merge – A Git client from the makers of Sublime Text
51–60 of 362 posts
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#52Hi 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
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?
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#53For my needs, GitX (rowanj fork) is still unbeat: 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…
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.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#54But, 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.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#55No 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.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#56> "The evaluation version is fully functional, but is restricted to the light theme only." They really know their target audience.
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.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#57Feedback: 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…
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.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#58Hi 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
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?
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#59Feedback: 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…
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.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#60Earlier quoted context omitted.
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)?
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).
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!