I'm using so many git-svn repositories (at the same time) that it's becoming a chore to update them all. I'd like to write a script that automates this, so I can just run it every morning while I fetch a coffee.
Basically my workflow is like this
cd ~/module1
git svn fetch
git checkout master
git svn rebase
git checkout topicbranch
git svn rebase
cd ~/module2
git svn fetch
git checkout master
git svn rebase
I've already automated the git svn fetch
part, which can be safely done anytime. But it's not so safe to do git svn rebase automatically as there might be conflicts.
How can a script figure out if there was a conflict after a rebase? Then I could run git rebase --abort, and write a line to a log file so I can review the failures when I get back with my coffee :)