I recently created a project on my local machine using maven archetype. See my previous post on how to generate a new project from installed maven catalog. I then got github.com created a repository for this project, for example: git@github.com:zhentao/test1.git
How can I associate my existing project with the newly created git repo? There are 2 ways to do it:
First option:
1. clone the git repo:
git clone git@github.com:zhentao/test1.git
It will clone the repo to test1 folder.
2. copy your existing project to test1 folder
cp -r /path/to/project /path/to/test1
3. commit and push all files
git add .
git commit -m "first commit"
git push -u origin master
Second option (more git style)
1. go to your project folder
cd /path/to/project
2. run the following commands:
git init
git add .
git commit -m "first commit"
git remote add origin git@github.com:zhentao/test1.git
The above commands associate your project to git remote repo.
3. run the following commands to to merge the conflict:
git fetch
git merge origin/master
--run it if conflicts exist
git mergetool
git commit
git push -u origin master
