컴맹 : 진화의 시작

[oops]$ git pull

remote: Counting objects: 99, done.

remote: Compressing objects: 100% (68/68), done.

remote: Total 69 (delta 51), reused 0 (delta 0)

Unpacking objects: 100% (69/69), done.

From 10.25.1.20:/work/git/oops

   dab9a8b..b49cd63  master     -> origin/master

Updating dab9a8b..b49cd63

error: Your local changes to the following files would be overwritten by merge:

        Makefile

Please, commit your changes or stash them before you can merge.

Aborting

[oops]$ git stash

Saved working directory and index state WIP on master: dab9a8b [ferret] add cpuname procfile

HEAD is now at dab9a8b This is test commit

[oops]$

[oops]$ git stash  -h

Usage: git stash list [<options>]

   or: git stash show [<stash>]

   or: git stash drop [-q|--quiet] [<stash>]

   or: git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]

   or: git stash branch <branchname> [<stash>]

   or: git stash [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]

                       [-u|--include-untracked] [-a|--all] [<message>]]

   or: git stash clear

1. git stash

2. git pull

3 git stash pop