git stash and merge : resolve conflict

conflictの解決。
現在変更中の物があるとき他で変更されていて git pullできないとき

$ git stash

Saved working directory and index state WIP on master: 40e49c2 Merge branch 'master' of host999:/home/git/lib-souten
HEAD is now at 40e49c2 Merge branch 'master' of of host999:/home/git/lib-souten

$ git pull
最新のmasterを落とす。

$ git stash list

stash@{0}: WIP on master: 40e49c2 Merge branch 'master' of host999:/home/

$ git stash pop

Auto-merging Web/User.php
# On branch master
# Changes not staged for commit:
#   (use "git add ..." to update what will be committed)
#   (use "git checkout -- ..." to discard changes in working directory)
#
#       modified:   Web/User.php
#
# Untracked files:
#   (use "git add ..." to include in what will be committed)
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (4283dad5a8fbe638796971bc68963d5cc591a322)

auto mergeでOKっぽいです。
Doroppedということで
＃ git stash list
は空になりました。

This entry was posted on 水曜日, 10月 19th, 2011 at 5:30 PM and is filed under blog. You can follow any responses to this entry through the RSS 2.0 feed. Both comments and pings are currently closed.

Unityによるゲームを公開しております iOS/Android
https://itunes.apple.com/jp/app/lost-knight-3d-action/id900917032
https://play.google.com/store/apps/details?id=com.groundroad.runknight

各種開発支援・機能開発等小さいお仕事などもお請けしております。
unity開発支援, PHPシステム開発, javascript/html5 フロント開発, titanium mobileアプリ開発
お気軽にお問い合わせください
大崎・五反田近郊での対面でのお打ち合わせはいつでも可能です。