1. git stash pop で conflict したとき
1.0 conflistの例
1 2 3 4 5 6 |
$ git stash pop Auto-merging inc/foo.h CONFLICT (content): Merge conflict in inc/foo.h Auto-merging src/bar.c CONFLICT (content): Merge conflict in src/bar.c The stash entry is kept in case you need it again. |