[git-users] Re: Conflicts from stash

2011-02-21 Thread Thomas Ferris Nicolaisen
Try git show stash@{0} It will show you the entire contents of the stash, not just the name of the stash (which could be anything, basically). -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-use

[git-users] Conflicts from stash

2011-02-21 Thread Roddie Grant
"git stash list" produces "stash@{0}: On bucketDisplay: site/css/site.css" from which I infer that the only file in the stash is site/css/site.css. But "git stash pop" lists merge conflicts with 5 other files. What's going on? Thanks Roddie Grant -- You received this message because you are su