Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

$ git pull
 ...
file file1.xc not up-to-date, cannot merge.
$ git stash
$ git pull
$ git stash pop

...