The normal approach is pretty much what the error message says: Either 
commit first, or stash the changes. Example of the latter approach:

$ git pull
<error msg>
$ git stash save
$ git pull
$ git stash pop
<handle conflicts>

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit
To post to this group, send email to
To unsubscribe from this group, send email to
For more options, visit this group at

Reply via email to