Question

[Update]

For more details, The reason that why I try to do pure Git at home is that, my company would like to move to Git but manager won’t like to make change because developer don’t have knowledge with Git on our own repository. So, what I try to do is, I try to make everyone use Pure git while someone can merge back to Subversion during this learning phase. So, in any emergency case, they can still using Subversion.

So, before everyone familar with Git, I cannot transfer repository to use pure Git. So, it will have both update on Subversion and Git. (and Main repository right now is Subversion). So, I try to make the way that Git can working smoothly during I have sync repository by dcommit back to Subversion.

[Question]

I am in the organization which use Subversion as repository, so I dump it as my personal Git (and plan to use replace Subversion with Git in the future)

Now, I have repository that use both Git and Subversion (Main Source). I have a problem to deal with git svn rebase when I have to use both git and subversion.

My Workflow is like below

At Office

1. The Repository have Git-svn interface
2. I always commit the code to Subversion with git svn dcommit from here.
3. I push to my remote git repository at Bitbucket

At Home

1. I clone the repository from Bitbucket
2. Working with and commit to Bitbucket

Now, Back to OFfice

1. git pull
2. git svn rebase
3. git svn dcommit
4. git push

In step 4. I have a problem that I already rebased my branch

Problem now here, when I am back home

When I come back home, I cannot use ‘git fetch’ because the branch is already rebased. So, I have to remove branch with git branch -D ….. and then git checkout again.

So, I look for the way that we can concurrent use both Git repository and Subversion and do going well with Git after done operation with git svn rebase or git svn dcommit.

Note. I won’t prefer to use any git-svn at home. Try to move forward to use only Git.

Answer 1

Found the solution from Version Control with Git book. Page 295.

Instead of use local – master branch, have to checkout remote branch

git checkout remote/master (Detach HEAD)
git merge --no-ff master (merge the local master)
git svn dcommit
git push origin (update to git Repository)

This model is for one person who will merge back to Subversion repository while the other work on pure Git OR pure Subversion. With this way, The Git Users can use Git without Merging problem.