合并从CVS存储库到GIT存储库的更改

Question

Currently my team of 5 is using a GIT repository to track changes we make in our module and some in other shared modules. But we have a CVS repository which is being used by all other teams to maintain other modules. So CVS repository has latest changes of all modules.

Now my doubt is how can I take changes from CVS repository to GIT repository .. is there any simplified or a FOOL PROOF way to merge these changes from CVS to git.

Actually our code in GIT was taken from CVS few months back and now we want to update it with changes from CVS with the latest features and changes.

Thanks in advance

Answer 1

I believe the answer to your question is here : How can I git-cvsimport multiple modules from a CVS repository, with differing branches?

Doesn't git cvsimport works?