4 ms·

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 T

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!
- gbersac 8y ago
  This a million time. With VSCode being more popular than sublime text now, not having first class git integration just after installing sublime text is a serious reason not to use it.
  - marmaduke 8y ago
    SublimeGit?
    - coldtea 8y ago
      Yeah, but actually integrated...
- jskinner 8y ago
  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.
  - gmandx 8y ago
    Just asking software engineering perspective, would be better to have the code that integrates Sublime Text <-> Sublime Merge as plugins? As in, the same Python plugin system that ST3 offers today?
  - kemayo 8y ago
    Speaking as the sublime-text-git person, something with official deeper integration would honestly be appreciated. There's a few common UI requests which something official would probably pick off as low-hanging-fruit but which are basically impossible with the current API. :D

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!

gbersac 8y ago
This a million time. With VSCode being more popular than sublime text now, not having first class git integration just after installing sublime text is a serious reason not to use it.
- marmaduke 8y ago
  SublimeGit?
  - coldtea 8y ago
    Yeah, but actually integrated...
jskinner 8y ago
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.
- gmandx 8y ago
  Just asking software engineering perspective, would be better to have the code that integrates Sublime Text <-> Sublime Merge as plugins? As in, the same Python plugin system that ST3 offers today?
- kemayo 8y ago
  Speaking as the sublime-text-git person, something with official deeper integration would honestly be appreciated. There's a few common UI requests which something official would probably pick off as low-hanging-fruit but which are basically impossible with the current API. :D