1.7.5: fixing git damage

[Jeremy Bopp]

On 11/22/2010 4:06 PM, Bill Ross wrote:
> 
> I just tried this sequence with my cygwin git:
> 
> $ git checkout master
> $ git pull
> $ git checkout my_branch
> error: Untracked working tree file
> 'java/api_client/test/xls/qa2/QA2WWWKeyword.xls' would be overwritten by
> merge.
> $ git --version
> git version 1.7.1
> -bash-3.2$ git status
> # On branch master
> # Untracked files:
> #   (use "git add <file>..." to include in what will be committed)
> #
> #       test/xls/qa2/QA2WWWKeyword.xls
> 
> *** What I am looking for is a solution to this:
> 
> -bash-3.2$ mv test/xls/qa2/QA2WWWKeyword.xls /cygdrive/c/tmp
> mv: cannot move `test/xls/qa2/QA2WWWKeyword.xls' to
> `/cygdrive/c/tmp/QA2WWWKeyword.xls': Device or resource busy
> -bash-3.2$ rm test/xls/qa2/QA2WWWKeyword.xls
> rm: cannot remove `test/xls/qa2/QA2WWWKeyword.xls': Device or resource
> busy

It looks like you might have that spreadsheet opened in Excel.  Make
sure the file is not open under any program.  Then you should be able to
move or delete it.

-Jeremy

--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple