What is going wrong in my git svn workflow?
However I’m having serious issues when changes overlap. I.e. I’ve been working on a feature which is not fully completed yet, so I have committed one part of it into my private git working copy but now can’t go for a SVN rebase to update and merge my version with the svn head. When I try to do so, it tells me that my working copy isn’t clean and that I need to stash my changes. Then svn fetch is running and a window pops up (I’m using TortoiseGit) where I can configure the rebase process. I select the master branch at the state of my partial feature and remotes/git-svn as upstream. Clicking ‘start rebase’ it again asks me to stash my changes twice in a row which is already very strange. Doing so it outputs an error message: ‘your local changes to the following files would be overwritten by merge: my_modified_partial_features_files.foo’. Why is this a problem? I thought that’s why I stashed before? If I then abort the rebase, it asks me to stash pop and again fails, telling me the merge would fail for all files now changed in the last svn commit.
- How to version control SQL Server databases?
- Mercurial “no username supplied” error on Mac
- What is the point of patching patchfiles?
- How do I perform a recursive checkout using ClearCase?
- Convert Git Repo to Darcs
- “forking” own project in git
Where is my mistake? Right now I can’t get even push my changes into the svn repository because I have to update and merge first. So basically I can’t get back and forth at all.