My Git Workflow

Clone repository to local machine: git clone <repository>

  1. git pull
  2. code... code .... code...
  3. code more.....
  4. git stash
  5. git pull
  6. git stash apply
  7. git add <filenames>
  8. git commit -m "commit message"
  9. git push

If any conflict occurs when stash is applied, resolve it either in IDE or using command line: git mergetool -t kdiff3 (invokes KDiff 3 if it installed)

Happy Coding :)

Share Comments
comments powered by Disqus