Reputation: 1357
We are working on a project for a client that has a git repository and we need to commit changes at the end of the week. In the same time, we also keep a local svn repository where we commit daily to keep track of changes. Would there be a problem to keep the .svn and .git in the same project folder? I'm thinking if I put the .svn in the gitingore and also tell svn to ignore the .git, I should be able to use the same project to commit daily on our local svn and also weekly on the git.
Has anyone tried this or does anyone see a problem with this approach?
Upvotes: 14
Views: 6601
Reputation: 70653
Please, for the sake of humanity just use git for this :).
Why don’t you just commit to git? You can set up you own central git repo and do your daily week work with that. At the end of the week you just do git push client mybranch
. Or if you don’t like your client seeing your internal history, do:
git checkout clientbranch
git merge --squash our-internal-branch
git commit -m "all of this weeks work"
git push client clientbranch
Upvotes: 3