A normal GIT workflow of a developer is:
1. Pull the changes on git
2. Check if any of this files are changes.
3. If merger error is there, manually merge it.
4. Add your changes to Git
5. Commit the changes
6. Push the changes.
1. Pull the changes on git
git pull
2. Check if any of this files are changes.
git status
3. If merger error is there, manually merge it.
4. Add your changes to Git
git add -A or git add filename
5. Commit the changes
git commit -m "Message for commit"
6. Push the changes.
git push
For details please follow this cheat sheet: https://training.github.com/kit/downloads/github-git-cheat-sheet.pdf
