Hacker News Board Hacker News, browsed like a classic message board
Live data from Hacker News

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

sublimemerge.com

Post reply on HN
Print view View original

71–80 of 362 posts

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

#71

Post by the_clarence »

jskinner wrote: post #58
neslinesli93 wrote: post #52

Earlier quoted context omitted.

Awesome stuff, I'm loving it! I guess it's time do finally ditch GitKraken and SourceTree (: I have a couple questions: - Do you have a plan to add git flow integration? And what about interactive rebases? - Please, please, allow free users to use dark theme as well! Sublime Text license was really great, why add such a small change?

Interactive rebase is absolutely coming (you can already edit commit messages and squash commits). UI support for Git Flow is going to depend on user feedback. I expect we will eventually, but even if not, we will be adding a plugin API, and it would naturally be doable via that.

Also, if you can rename all these opaque commands to be more user friendly :) even if this means adding more commands, I think it’s worth it. “Rebase” should be the first victim

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

#73

Post by mstade »

davman wrote: post #51

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.

I'd pay cash monies for this! Particularly if it's cross platform.

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

#74

Post by coldtea »

jskinner wrote: post #11
coldtea wrote: post #9

Earlier 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).

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.

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

#75

Post by p0nce »

jskinner wrote: post #2

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

Thank you. I use Sublime every day, and will for the foreseeable future.

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

#76

Post by sammorrowdrums »

jskinner wrote: post #2

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

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!

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

#77

Post by nerform »

davman wrote: post #51

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.

Awesome idea. Cross platform fast terminal with nice tmux integration.

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

#79

Post by jskinner »

nicoburns wrote: post #60
jskinner wrote: post #11

Earlier quoted context omitted.

Thanks for the kind words! There's some basic integration now, and we'll be adding more in the future. Right now, Sublime Merge will pickup installed Sublime Text packages (e.g., for syntax highlighting), and will also find Sublime Text when you choose Open in Editor from within Merge (this can be customised to something else though, of course).

It would be cool to have some integration going the other way. In particular I would love: 1. If Sublime Text could detect when a directory is a git root directory, and present a button to "open in sublime merge" (my sublime projects often span multiple git repos, so detection on a folder by folder basis would be key). The ability to configure this to use another git client would make sense, although personally Subli…

We'll 100% be adding integration in that direction too. A new build of Sublime Text shouldn't be too far off, there are some nice thing's that we've added into Sublime Merge (e.g., an update theme system), that I want to roll into Sublime Text.

With regards to Stage All, we don't have a button, but we do have a key binding: Command+Shift+A to stage all Modified files, and then press it a second time to stage all Untracked files, if desired.

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

#80

Post by mstade »

badpun wrote: post #70
polyvisual wrote: post #56

Earlier quoted context omitted.

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 :/

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.

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.
Post reply on HN