Error: Cannot pull with rebase: You have unstaged changes

by

If you want to keep your working changes while performing a rebase, you can use --autostash. From the documentation:

Before starting rebase, stash local modifications away (see git-stash[1]) if needed, and apply the stash when done.

For example:

git pull --rebase --autostash

More Related Contents:

  1. Should I check in folder “node_modules” to Git when creating a Node.js app on Heroku?
  2. Permission denied (publickey) when deploying heroku code. fatal: The remote end hung up unexpectedly
  3. Does “git fetch –tags” include “git fetch”?
  4. How to link a folder with an existing Heroku app
  5. Cannot push to Heroku because key fingerprint
  6. heroku: src refspec master does not match any
  7. How can I deploy/push only a subdirectory of my git repo to Heroku?
  8. How to pull specific directory with git
  9. Pull a certain branch from the remote server
  10. Trying to git pull with error: cannot open .git/FETCH_HEAD: Permission denied
  11. Getting an error pushing to github – Updates were rejected because a pushed branch tip is behind its remote
  12. failed to push some refs to [email protected]
  13. Heroku: How to push different local Git branches to Heroku/master
  14. Delete local Git branches after deleting them on the remote repo
  15. How can I make my local repository available for git-pull?
  16. Create new pull request from fork without having commits of the previous fork
  17. After git push heroku – uploaded files on Heroku are lost
  18. How to undo a git pull?
  19. git push heroku master says “Everything up-to-date”, but the app is not current
  20. Why do I obtain this error when deploying app to Heroku?
  21. Pushing to github after a shallow clone
  22. Error in git push heroku master through ssh behind proxy
  23. ‘git push heroku master’ is still asking for authentication
  24. What is the reason for “Procfile declares types -> (none)” in Heroku?
  25. When will `git pull –rebase` get me in to trouble?
  26. How to push different local Git branches to Heroku/master
  27. Checking out old files WITH original create/modified timestamps
  28. Is it possible to include a file in your .gitconfig
  29. How can I archive git branches?
  30. Git: add vs push vs commit

Leave a Comment