Git stash

Notes for me.

• Unable to do a git pull because of updated file already conflicting with working copy
• Stash the working copy changes
• git stash list <- checks stash is empty
• git stash <- if empty then stash the changes
• working copy changes now in the stash
• git pull <- I can safely pull the changes
• git stash pop <- Apply the changes from the stash onto the newly update working copy