Show HN: Sublime Merge – A Git client from the makers of Sublime Text • Hacker News Board

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

#301

Post by chipotle_coyote » Thu, Sep 20, 2018, 8:55 PM UTC

mixmastamyk wrote: post #291

mixmastamyk wrote: post #277

Earlier quoted context omitted.

I've never experienced a non-performant cross-platform UI. Well, to be honest I've heard of folks complaining about Electron apps, but are easy enough to avoid. Oh yeah and Swing was a bit sluggish… in the 90s. What am I missing?

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

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

#302

Post by jskinner » Thu, Sep 20, 2018, 8:55 PM UTC

benwills wrote: post #168

Straight to payment for me. Sublime Text is one of the few pieces of software I've just felt was done totally right at so many levels. Entirely happy to give you more of my money.

Thanks for your support!

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

#303

Post by desmondw » Thu, Sep 20, 2018, 8:56 PM UTC

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 for allowing scrolling past the end. Seriously.

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

#304

Post by jskinner » Thu, Sep 20, 2018, 8:57 PM UTC

asfaltboy wrote: post #240

@jskinner can we run the 3-way merge tool from command line, i.e to set it as a `git mergetool` ?

It's not exposed via the command line right now

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

#305

Post by giancarlostoro » Thu, Sep 20, 2018, 8:59 PM UTC

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.

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

#306

Post by jskinner » Thu, Sep 20, 2018, 8:59 PM UTC

chrisper wrote: post #114

I can't figure out how to configure SSH key or where to find a documentation for the settings file :( EDIT: Ok I found out it just takes the SSH key from ~/.ssh But now it complains about C:\\Program Files\\Sublime Merge \\ssh-askpass-sublime.exe missing.

Sorry about that - I missed a part in our Windows installer, and ssh-askpass-sublime.exe isn't being installed. This will be resolved in the next day or two, in the mean time the portable version has it - https://www.sublimemerge.com/download

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

#307

Post by tsumnia » Thu, Sep 20, 2018, 9:02 PM UTC

I've only gotten to play with it for a short while, but does it handle GitHub Enterprise repos as well?

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

#308

Post by jskinner » Thu, Sep 20, 2018, 9:04 PM UTC

jarek83 wrote: post #200

Whenever I try to do something I get an error: xcrun: error: invalid active developer path (some path here), missing xcrun at: some other path here

We use the system Git by default on Mac if it's installed, but it sounds like that's not working for you. If you set your git_binary preference to "bundled", we'll use the one that comes with Sublime Merge instead.

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

#309

Post by jskinner » Thu, Sep 20, 2018, 9:07 PM UTC

davidlartey wrote: post #154

Hello Jon, congratulations on Sublime Merge. ST has been my preferred editor for as long as I can remember. I'm trying out Sublime Merge, but it seems my git hooks aren't been called. Am I the only one experiencing this? A feature or a bug?

Git hooks will be run, as all mutating actions go through git itself, however pre-commit hooks may not work as you expect with this setup. When you commit via Sublime Merge, it's doing a git commit -m "...", which works differently with git hooks than a plain git commit.

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

#310

Post by jskinner » Thu, Sep 20, 2018, 9:09 PM UTC

commanderjroc wrote: post #160

Hey Jon, Sublime Team. Is there a way to make the "Staged Files" view appear at the top of the tool? Preferably above "Working Directory" ?

It's not configurable, but you can click on the "Working Directory" head to collapse all the files there, which will make seeing the Staged changes easier