Github on Anurag's Blog

Git stash

Tue, 24 Jul 2018 00:00:00 +0000

Git stash allows you to save your changes to a repo, without any commits, and go back to the clean state that your repo was in since the last commit. I use stash when I have to pull changes from origin into my code, but I don’t want to commit any of my own changes. Stash allows to manage merge conflicts as well. You can use stash when you want to switch branches.

How I Merge

Thu, 31 May 2018 00:00:00 +0000

Stage the files

git add <files>

Commit the files

git commit -m "<message subject>" -m "<message body, if needed>"

Pull the master

git pull origin master

Merge any conflicts and commit. Then,

git push origin master

Profit!