X-Recipient: archive-cygwin@delorie.com
X-SWARE-Spam-Status: No, hits=-1.9 required=5.0	tests=AWL,BAYES_00
X-Spam-Check-By: sourceware.org
Message-ID: <4CEAEA70.6030205@bopp.net>
Date: Mon, 22 Nov 2010 16:10:56 -0600
From: Jeremy Bopp <jeremy@bopp.net>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6
MIME-Version: 1.0
To: cygwin@cygwin.com
Subject: Re: 1.7.5: fixing git damage
References: <27D7F4C907BCB14FAF95CC4E25AB1FE6012C77E7@ex2.AdBriteInc.local>
In-Reply-To: <27D7F4C907BCB14FAF95CC4E25AB1FE6012C77E7@ex2.AdBriteInc.local>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-IsSubscribed: yes
Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm
List-Id: <cygwin.cygwin.com>
List-Subscribe: <mailto:cygwin-subscribe@cygwin.com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin@cygwin.com>
List-Help: <mailto:cygwin-help@cygwin.com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner@cygwin.com
Mail-Followup-To: cygwin@cygwin.com
Delivered-To: mailing list cygwin@cygwin.com

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