First, let me preface this post by saying that yes I am new to git and that 
it has by far the steepest learning curve of any source control system I 
have used.

My question is a two parter.

1) I am working in a slightly different environment than my colleagues and 
need changes to the source in order to build.  Yes, there are probably ways 
to refactor our code to alleviate this problem at least somewhat, but I am 
the new guy and that's political (don't get me started).  Anyway, I would 
like to set up some sort of SANE system such that whenever I fetch, I can 
apply my changes without adding them to the change list so as NOT to commit 
them.

2) I thought I could use git stash for this, so I did this:

git stash --include-untracked


and when I do

git stash show


it shows this:

backend/infinispan-rar/pom.xml                     |   12 ++++++++++--
backend/pom.xml                                    |   13 +++++++++++--
backend/test/pom.xml                               |    3 +--
.../main/resources/com/mojiva/testDbContext.xml    |    6 +++---
data/mojiva.xml                                    |    2 +-
dbmigration/pom.xml                                |   16 ++++++++++------
.../main/resources/db/changelogs/issue-17544.xml   |    4 ++--
pom.xml                                            |   11 +++++++++++



but when I try to retrieve them,



it doesn't work:

backend/activator/effective.pom already exists, no checkout
backend/adverter/src/test/java/com/mojiva/presenter/RequestParamReplacerTest.java
 already exists, no checkout
backend/dao/.cpath already exists, no checkout
backend/dao/.e0 already exists, no checkout
backend/dao/PutObjectStoreDirHere/defaultStore/Recovery/TransactionStatusManager/#22#/0_ffffc0a86465_cfd2_5016b5cb_1
 already exists, no checkout
backend/dao/dep.tree already exists, no checkout
backend/feeds-test/.e0 already exists, no checkout
backend/feeds-test/dep.tree already exists, no checkout
data/wurfl-patch.xml already exists, no checkout
run/linksDB.log already exists, no checkout
run/linksDB.properties already exists, no checkout
run/linksDB.script already exists, no checkout
Could not restore untracked files from stash


I really need these files back and stash won't give them back!

Any help would be appreciated.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/A6umBNBpw3sJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to