My Git Workflow
Clone repository to local machine: git clone <repository>
- git pull
- code... code .... code...
- code more.....
- git stash
- git pull
- git stash apply
- git add <filenames>
- git commit -m "commit message"
- 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 :)