I use SublineText and SublimeMerge along side GitKracken too. Been happy with Sublime Products.
I was playing with Git on it though, and I couldn’t figure out how to resolve merge conflicts.
I prefer GUI’s for solving merge conflicts.
Simple ones I solve in my Git client. SourceTree at work and Fork (and earlier Tower) at home.
Difficult ones I solve using Kaleidoscope (3; the older non-subscription variant).
1 Like
Two potential locations (I haven’t touched these in awhile so I can’t confirm they change the same setting.)
chsh- set path there- Settings → Users → Ctrl+click user for menu → Options → Choose… under Login Shell
Whichever you choose, it won’t work unless you log out and log back in. echo $SHELL in Nova while system default shell is selected should match what’s in iTerm.
If anyone is still interested, it looks like Panic realized they totally misread the market. They cut their prices by 50%. You can subscribe to Prompt 3 for $9.99/year or pay $49.99 one-time. This pricing is more in line with reality so I went with the yearly sub. I have been burned by their discontinuing of “one-time” pay apps (Unison, Coda, Transmit iOS, Prompt 2) so I will steer clear of that pay model with them…
3 Likes