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 🙂

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s