StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POHow to deal with Git-svn when have to use both Git and Subversion
text
Body
copied!<p><strong>[Update]</strong></p> <p>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.</p> <p>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.</p> <p><strong>[Question]</strong></p> <p>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)</p> <p>Now, I have repository that use both <strong>Git</strong> and <strong>Subversion (Main Source)</strong>. I have a problem to deal with <em>git svn rebase</em> when I have to use both git and subversion.</p> <p>My Workflow is like below</p> <p><strong>At Office</strong></p> <blockquote> <ol> <li>The Repository have Git-svn interface</li> <li>I always commit the code to Subversion with <em>git svn dcommit</em> from here.</li> <li>I push to my remote git repository at Bitbucket</li> </ol> </blockquote> <p><strong>At Home</strong></p> <blockquote> <ol> <li>I clone the repository from Bitbucket</li> <li>Working with and commit to Bitbucket</li> </ol> </blockquote> <p><strong>Now, Back to OFfice</strong></p> <blockquote> <ol> <li>git pull </li> <li>git svn rebase</li> <li>git svn dcommit</li> <li>git push </li> </ol> </blockquote> <p>In step 4. I have a problem that I already rebased my branch</p> <p><strong>Problem now here, when I am back home</strong></p> <p>When I come back home, I cannot use 'git fetch' because the branch is already rebased. So, I have to remove branch with <em>git branch -D .....</em> and then <em>git checkout</em> again.</p> <p>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 <em>git svn rebase</em> or <em>git svn dcommit</em>.</p> <p>Note. I won't prefer to use any <strong>git-svn</strong> at home. Try to move forward to use only Git.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload