Updating git repository using stash

The following commands to merge changes from the repository in the current source.

  • git stash or git stash -u
    Hide the changes you have in your project. The -u will also hide the newly created files.
  • git pull
    Get the changes from remote;
  • git stash apply or git stash pop
    The former applies the stash, but also keeps it in the stash list. The latter also removes it from the stash list.