Shelve local changes and get latest with git cmd -


this question has answer here:

new git

i making rather large changes in main branch of our project still local machine. friend committed large changes our project in main branch.

how set aside local changes , pull stuff can test , perhaps commit changes pull?

i'm using git bash on windows.

first, stash working copy changes (or make temporary branch them, we'll go stash now):

$ git stash save "stash message" 

then fetch buddy's changes:

$ git fetch <remote> <branch> 

if buddy's changes, merge them local branch:

$ git merge <remote>/<branch> 

then if want restore previous working copy, pop it:

$ git stash pop 

Comments