It's also fair to think that since it's so up in the air if the app will keep existing or what features they'll even be able to build, they're probably not sure wether they should keep investing on it or not /:
For merges and other finicky git actions I’ve been increasingly turning to Atom instead of the commandline. I like how it auto-formats my commit messages to line wrap and how it makes highlighting merge conflicts easy.
I just wish it wasn’t so tedious to version control Jupyter notebooks. I always try and clear the output before I stage it so I don’t have large binaries of plots or figures that were generated.