I am dealing with a project which was moved to GitHub repo with some major updates in the project base. But those who work on same project base has only the non updated version. So how to convert their local non-git repo to local git repo and update them with new version of the same project.
I have gone through all documentation of git and still I am not clear
To keep their work, the best way would be:
# current dir is ~/oldversion # create a new directory mkdir ~/newversion # get the clean versioned project git clone [email protected]:Your/repo . # create a new local branch and go on it git checkout -b migration # now copy everything from the old project. the modified files will appear with "git status" cp -r ../oldversion/* ./ # commit the last work git commit --all -m "importing to git" # now, make some checks/editio, git diff, git rm, git revert, git checkout path/to/file whatever ... # then import your work in a branch for everyone, if you use master that means git checkout master git merge migration --no-ff -m "migrated by me" If a scm was used, you may prefer to exclude some files at one point, like the .svn directories.
One way would be to:
git init in your local code base, add everything and commitorigin: you have the right to push to origin, not to upstream.origin and upstream in GitHub?".
git add . says fatal: confused by unstable object source data for 5ff6461b50272925aa5481de381f9797bb2784bf
.gitignore file in order to version only what you need (and not what could be generated)