Just encountered an error while committing in Git SVN:
Merge conflict during commit: File or directory...
Too good the solution was easy:
git svn fetch
git svn rebase
#resolve files in conflict if any
git svn dcommit
git svn rebase
#resolve files in conflict if any
git svn dcommit
No comments:
Post a Comment