Using Git with SVN

Update: Some people prefer another solution: commit (git svn dcommit) from Trunk-Blue. The process is simliar, the benefit is that you do not have to switch between Green and Blue folders.

I am now working on a web project. our local CI build takes more than 20 minutes now. while we are working to speed up the build, I am also trying to create a local build folder, so that I can still work (modify code) when the local build is running. the idea is quite simple. we have two folders, one for committing (namedTrunk-green) And the other for editing (namedTrunk-blue). When we want to run local build we sync the code from the committing folder. however the solution is not that simple, when it comes to a team of more than 10 developers and QAs working on it. I met a lot of problems, and I am not confident to promote it to others yet now. anyway, I will record what I learned during working out the final solution.

1. How to force git to overwrite local files on pull?

When there is a conflict between the two sides of the Code, git pull directly reports an error. You can use git fetch -- all, and then git reset -- hard origin/master. See http://stackoverflow.com/questions/1125968/force-git-to-overwrite-local-files-on-pull

For more information, see the following link: error: Untracked working tree file 'public/images/icon.gif 'wocould be overwritten by merge ..