We used to use CVS in our team and we are trying to migrate to git, but for some strange reason one of the programmers has been working on a big project by manually updating the branches instead of using version control. This has led to many human error discrepancies in the code and we're not sure where to go from here.
Right now we are waiting on that programmer to consolidate those branches before importing to git, but it is taking way too long. We are considering importing all the branches separately and then merging them in git. We're just not sure how to do this with non-version controlled branches.
What is the best way to go about this?