This file will give you an idea how to start with the git repo Check-in's/ Check Out and mearge.
-
Create Repo from git hub
-
Open Git console at your local pc
-
git clone <https:git url>
-
For add file into the repo
git add . //This will add file into the git you can also do git add
-
Status for your git
git status // Will list git file status at local.
-
Commit your file
git commit -m "First Angular app in to the git" .
-
Final push to the remote git
git push -u origin master
-
In case u updated something at the git site then you need to do below before next commit.
git pull origin master
-
In case of conflicts
git status
git stash
git pull
git stash pop
git status
Please feel free to email me if you need any help in setting up git at you local/server. For Brie introduction you may go at https://git-scm.com/docs