Page History

...

• Make a  branch: git checkout -b branch_name
• Develop code on the branch
• Commit at regular interval: git commit -m "a commit message"
• Keep track of master branch: if another pull request has been merged, you want to include these new changes in your code.
  • git checkout master
  • git pull
  • git checkout branch_name
  • git merge master
  • Resolve conflict if any
• When a milestone or an important step is reached make a pull request on github

Some useful commands

• git status
• git diff: show uncommitted changes
• git log: show commit history