I am working on a project that uses SVN as repository which I use in combination with the Netbeans SVN plugin. I found Netbeans SVN diff lacking on showing several diffs below each other and therefore wanted to use git-svn
for being able to use git gui
.
The problem is now keeping both repositories in sync. My current workflow is:
Updating (with no local changes):
svn up git stash -u # include new files too git svn rebase git stash drop
Comitting:
git commit git commit ... git svn dcommit
These base cases do work, but it does not work nicely if I have local unstaged/uncomitted changes.
What is a better way to keep the local git-svn and .svn in sync?