Live data from Hacker News

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

sublimemerge.com

181–190 of 362 posts

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

#181

Earlier quoted context omitted.

> doesn't have features such as tabs The lack of tabs is a feature for some of us. After all, why have tabs when you can have tmux? :)

I needs to connects to multiple servers at the same time, and tmux sessions shouldn't be stacked. How can I do that without tabs?

If you have 2 tmux servers with different hotkeys you can totally nest them safely. I have a different hotkey prefix for my machine and then leave the default for servers. Works great!

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

#182
post #23

> "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.

After years of clicking cancel as a student, I was more than happy to shell out the full amount for a license after my first paycheck. Don't think I would've stuck around if the free versoin was gimped in any way.

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

#184
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

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.

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

#186
post #96

"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.

p4merge also display 4 panels as you described. It's been my go-to merge tool for years now.

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

#187
$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?

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

#188
post #157

Earlier quoted context omitted.

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

We built the animations using a slightly enhanced version of anim_encoder, which I currently have online at https://github.com/wbond/anim_encoder . One of the changes was adding pngquant which helped compress the images a bunch beyond pngcrush.

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.

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

#189
post #96

"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.

Jetbrains IDE's use the 3-pane approach and I find it very, very easy to use. Just the right amount of info for 95+% of use cases.

If I need a common accessor, I'll pull it up some other way (either via history tools or actually finding it in Github).

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

#190
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

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?

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