Re: 1.7.5: fixing git damage

2010-11-22 Thread Bill Ross
From: ... On Behalf Of Jeremy Bopp Sent: Monday, November 22, 2010 2:11 PM Subject: Re: 1.7.5: fixing git damage >On 11/22/2010 4:06 PM, Bill Ross wrote: >> >> [git stuff] >> >> *** What I am looking for is a solution to this: >> >> -bash-3.2$ mv test/xl

Re: 1.7.5: fixing git damage

2010-11-22 Thread 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 >