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

311–320 of 362 posts

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

#311

Post by mixmastamyk »

chipotle_coyote wrote: post #301
mixmastamyk wrote: post #291

Earlier quoted context omitted.

Still no answers but a lot of malicious downvotes.

Allow me to somewhat quippishly rephrase your original post: "I've never heard of badly performing cross-platform apps, except for the ones written in what's currently the most popular cross-platform toolkit and the ones written in one of the most popular cross-platform toolkits a generation ago."

That leaves one poor performing toolkit, that has an excuse at least. Not hard to avoid apps written in it, in any case.

Qt, Wx, Java, and many others don't or no longer perform poorly. So why the surprise there is one more? Maybe some folks don't know they exist.

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

#312

Post by recursive »

giancarlostoro wrote: post #305
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

My one question why was this made into it's own thing and not integrated into Sublime? I sort of would love to see Sublime have a bit more power, I can only assume it would start to consume too many resources? It'll be interesting to see what else you guys make. I really hope you consider making SublimeMail as others suggested.

Do one thing and do it well.

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

#316

Post by kemayo »

jskinner wrote: post #79
nicoburns wrote: post #60

Earlier quoted context omitted.

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 Untr…

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

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

#317

Post by [deleted] »

tom_ wrote: post #164
krupan wrote: 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.

You can use the central panel for both: common ancestor text in the neutral colour, and differences between the common ancestor and the resolved text in colour, with one colour for differences that come from the 'left' set of changes, and one colour that come from the 'right' set. 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…

[deleted]

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

#318

Post by [deleted] »

Volt wrote: post #298
fastball wrote: post #173

Earlier quoted context omitted.

Presumably as time goes on it will become more and more integrated with Sublime Text, which is arguably a "very good editor". Or is that not what you mean?

Probably to be read as (very good) (editor integration) rather than (very good editor) integration.

[deleted]

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

#320

Post by pfranz »

onion2k wrote: post #108
krupan wrote: 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.

A 3-way merge involves your changes, others changes, a common ancestor, and the resolved text. That's true, but is it important to have all those things visible when you're resolving a conflict? The design of a UI should be driven by what the user needs to see , not the data that's being used . Most apps have absolutely loads of invisible data in the background making things work; that doesn't mean they need to be fr…

I actually just encountered this today. My changes, a large refactor, was trying to be reconciled with tweaks done before my refactor. Diffing mine against their's was gross. The first thing I wanted to see what their changes diffed against our ancestor looked like.

However, in the end I didn't end up merging any code and I haven't yet been in a position where this has come up much. I just thought it was a funny coincidence I encountered this earlier today.

Post reply on HN