Training_Assignment

git init - initialize local repository
touch test.txt - create a test.txt
Edited test.txt
touch .gitignore - empty gitignore(This can avoid unwanted files)
git add . (Staged of all files in master)
git commit (Commit in master)
git remote add origin url (Remote repository for pushing local files)
git push --set-upstream origin master(Create a remote master branch and push the local files)
git checkout -b feature(Created a new branch called feature and switched to it)
git merge master(Merge files from master to feature)
git push --upstream origin feature
Played with "git rm rf --cached test.txt" in between git add .
Created merge conflict by editing same line in test.txt from master and feature.
Added both changes from vs code.
Pushed master
Merged master to feature.
Pushed feature.
Created README.md in remote repository.
git pull to pull README.md
git logs(Check logs)
git diff id1 id2(Difference between two commits)
git tag name created a tag.
mkdir code Created a directory named code in feature
Added app.js in code folder
git push pushed it remote server
git checkout master Switched to master
git pull pulled updated README.md
git merge feature merged feature to master branch
git push pushed master branch
Edited README.md locally
git status
git add . Stage locally edited README.md
git commit
git push

Provide feedback