I will try it out immediately, but I am surprised GitSavvy[1] was not even mentioned in this thread. It's by far my everyday package, and it fits very nicely. It's the only thing in a way of really wanting this.
Show HN: Sublime Merge – A Git client from the makers of Sublime Text
141–150 of 362 posts
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#142Earlier quoted context omitted.
Thanks, I think I'd seen this one in the past but had ruled it out due to no Windows support (at the time). Edit: Ah, also "doesn't have features such as tabs" ruled it out for me.
Alacritty isn't actually super fast, the author just opened three other emulators and decided to call Alacritty "the fastest terminal emulator on earth". Kitty is much more full-featured and super fast. I've switched to it and love it to bits. EDIT: Ah, it's not available for Windows, too bad. It's the best.
He did a bit more than that[0], and he comapred it to Kitty.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#143+1 for Stage Lines
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#144Earlier quoted context omitted.
Thanks, I think I'd seen this one in the past but had ruled it out due to no Windows support (at the time). Edit: Ah, also "doesn't have features such as tabs" ruled it out for me.
Alacritty isn't actually super fast, the author just opened three other emulators and decided to call Alacritty "the fastest terminal emulator on earth". Kitty is much more full-featured and super fast. I've switched to it and love it to bits. EDIT: Ah, it's not available for Windows, too bad. It's the best.
> It's the best.
Heard of Konsole? It doesn't need GPU to achieve the same speed.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#145Earlier quoted context omitted.
Alacritty isn't actually super fast, the author just opened three other emulators and decided to call Alacritty "the fastest terminal emulator on earth". Kitty is much more full-featured and super fast. I've switched to it and love it to bits. EDIT: Ah, it's not available for Windows, too bad. It's the best.
He did a bit more than that[0], and he comapred it to Kitty. [0] https://jwilm.io/blog/alacritty-lands-scrollback/
Oh that's good, thanks for the heads up. Pretty recent post.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#146"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…
It's fair to take either opinion – personally I often find the common ancestor quite important, but I could understand why you might not. But it's disingenuous to call a tool "three way merge" if it's not shown. If you're only showing the two immediate parents, that's a regular old two-way merge.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#147Hi 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
Looks very nice! Two things I noticed right out on a projet:
- It doesn't seem to be picking up my global .gitignore file. I see untracked changes of something that should be ignored. It doesn't appear on any other git client nor `git status`.
- Please add regex to the search :)
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#148Earlier quoted context omitted.
I would keep an eye out on alacritty. It's a blazingly fast gpu-accelerared terminal emulator for Unix (currently) written in rust. According to their 0.2.0 announcement post, where they added scrollback support, Windows is next on the Roadmap.
Thanks, I think I'd seen this one in the past but had ruled it out due to no Windows support (at the time). Edit: Ah, also "doesn't have features such as tabs" ruled it out for me.
> 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? :)
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#149Earlier quoted context omitted.
Alacritty isn't actually super fast, the author just opened three other emulators and decided to call Alacritty "the fastest terminal emulator on earth". Kitty is much more full-featured and super fast. I've switched to it and love it to bits. EDIT: Ah, it's not available for Windows, too bad. It's the best.
> It's the best. Heard of Konsole? It doesn't need GPU to achieve the same speed.
I like Kitty because of the built-in layouts, the speed is a bonus for me.
Re: Show HN: Sublime Merge – A Git client from the makers of Sublime Text
#150Hi 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 notice that seats can be changed any time in a Business subscription. Is the end of subscription recalculated each time you add or remove a seat?