No, I know about that page but it's not useful.
I know I must do a new checkout, but I'd use a guide on how to do so in
the best way. How to list "my" files in the folder (there are so
many...)? What will happen with files with local modifications (svn
handles them very easily)? What changes in git compared to what you
can/have to do with svn?
For now I only tried making the checkout and then moving over all old
files, but then I can't merge them because git thinks everything is up
to date. I guess I can try doing the opposite, but it's so easy to waste
hours and get terrible headaches with git that I know I'll be too lazy
to do any update for months (until something breaks horribly) unless I
have a guide. Thanks.
There is a problem with changes on the working copy which are not committed or stashed.
Pulling the repo often fails with the following:
C:\pwb\compat>git pull "origin" master -v --progress
* branch master -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.
svn merged it automatically if there where no conficts and if there where some conflicts I
could easy solve it. Any ideas for that flow with git?