How to return git-svn branch to SVN HEAD?

I have a local git repository that tracks the remote SVN repository through git svn. I made and made some changes to the local git repository, but now I would like to create a branch reflecting the HEAD SVN in order to make some changes to the code, since it is in SVN because I do not want to propagate the changes in my git host to SVN not yet. How can i do this?

Immediate observation: I will need to make and make changes to SVN HEAD, and then merge them back into my git wizard. How can I do it? Am I git mergethe svn-edits branch in master, or am I doing git svn rebase?

+5
source share
1 answer

, , , trunk ( old-trunk).

git checkout -b real-trunk remotes/trunk

real-trunk . .

git svn dcommit
git checkout old-trunk
git rebase real-trunk

, .

+5

All Articles