it is possible that git thinks the file has been modified. you can
try a git checkout to revert the file.
try:
git checkout src/test/rides/2009_12_13_16_11_42.csv
that should remove any changes, and allow you to rebase.
Jamie
On Mon, 21 Dec 2009, John Legelis wrote:
> Been trying to put together another patch, but been seeing this message for
> a while. Not much online about the message... any insight? Not that the
> csv file is *not *part of my patch - could my local Git index be corrupt?
>
> C:\temp\CT\GoldenCheetah\src>git rebase -i origin/master
> *src/test/rides/2009_12_13_16_**11_42.csv: needs update*
> *Working tree is dirty*
> C:\temp\CT\GoldenCheetah\src>
>
> --
> _______________________________________________
> Golden-Cheetah-Users mailing list
> golden-che...@googlegroups.com
> http://groups.google.com/group/golden-cheetah-users?hl=en
"It is a mistake to think you can solve any major problems with just
potatoes."--Douglas Adams
__________________
Jamie Kimberley
Postdoctoral Fellow
Department of Mechanical Engineering
The Johns Hopkins University
Office: 410.516.5162
Mobile: 217.621.8272
Fax: 410.516.4316
E-Mail:jamie.k...@jhu.edu