161–170 of 362 posts
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.
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.
Kind of curious, what don't you like about ConEmu? I've been using it for many months now and it's been nothing but solid. I spend 99% of the time using the WSL terminal, and every once in a while I run a PowerShell terminal too.
"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.
This is what Araxis Merge did, or at least used to do when I used it, and I found it more useful than P4Merge's 4-way display (which just takes up more space than necessary).
It's possible there are types of merge where it's useful to have the common ancestor permanently visible, but I never seemed to run into them.
Earlier quoted context omitted.
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.
Completely off topic but would you care to describe how you install your system automatically?
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
EDIT - read the blog post and idly wondering if you would ever consider licensing Sublime's UI engine?
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.
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.
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
I'm hoping you could somewhat detail your custom UI toolkit used in these apps as they are consistently fast and uniform across platforms?