Home/ Questions/Q 566347
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-13T12:58:03+00:00

My project I am working on is version controlled under SVN. I had to

  • 0

My project I am working on is version controlled under SVN. I had to do a large number of refactorings. For this purpose I took my workspace and created a new git repository. Afterwards I made the refactorings and committed to my local git repository as often as possible, made branches etc..

Meanwhile someone made commits to the SVN. Now I would like to commit my changes also into the SVN.
Adding the SVN via git-svn clone doesnt help, because the clone and the existing branches cant be merged (missing common ancestor) even if the tracked files are the same.

Is there a possibility to add a SVN link and/or create this ancestor?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    It’s sort of a dirty hack in this instance, but if you smash all the commits down using rebase, you could probably just cherry-pick the consolidated change.

    UPDATE: Also, you might try using rebase to move the root of the branch you did your refactoring on so that it branches from a branch that tracks the git-svn repo.

    UPDATE 2: As ndim says, the rebase option you’re looking for is probably --onto.

    • 0