Now we know why Panic blocked Prompt for iOS on the Mac (even though we were using it)

21

I use SublineText and SublimeMerge along side GitKracken too. Been happy with Sublime Products.

22

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
23

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.