Well.. I did some headless committing and merging and now I am deep in the ….
Here’s what I did:
- fetched trunk with git-svn
- branched off work
- git commit ed stuff to work
- git svn dcommit ted the cnanges to svn, (yes, this i where it gets interesting)
- git checkout master
- git merge work
In this situation, git doesn’t seem to understand that the changes to svn
are the same as in itself. It is now up to date, but when I try to
git svn rebase master
I get Invalid upstream
The Solution to this was:
Do a hard reset on Master to a common ancestor (svn and master)
then I did a rebase.
Now all directions of merges work again, as far as I can tell.
I am still a total git newbie…