GitHub Community
Subversion/git-github troubles #21681
-
|
Hello, I use github as a final publication point for a subversion repository. In the past, this has gone well. I’m familiar with how to create and maintain a git repo that mirrors the changes checked into subversion. My troubles started, however, when the subversion repo had to be restored from backups, making the github.com repo one (1) check-in ahead of the existing subversion repo. Since then, I’ve had to add a step where I update my local git repo from subversion, then merge changes from github, and finally push all changes to github. This is not going to work forever. I see two solutions, neither of which I know how to do:
I know, it’s complicated. Any help is appreciated. |
Beta Was this translation helpful? Give feedback.
Replies: 2 comments
-
|
Since you’re already pulling in changes from subversion and the GitHub-based git repository, then you should be able to do the following:
You can do this by using ? WARNING: A force push is a potentially destructive action. But you want to destroy the one extra commit, so it s |
Beta Was this translation helpful? Give feedback.
-
|
Thank you very much lee-dohm! |
Beta Was this translation helpful? Give feedback.
Since you’re already pulling in changes from subversion and the GitHub-based git repository, then you should be able to do the following:
You can do this by using
git push --forceinstead ofgit push.? WARNING: A force push is a potentially destructive action.
But you want to destroy the one extra commit, so it s