Re: GNU make 3.99.92 release candidate is available

[Paul Smith]

On Mon, 2013-09-23 at 19:56 +0300, Eli Zaretskii wrote:
> > From: Paul Smith <address@hidden>
> > Cc: address@hidden
> > Date: Mon, 23 Sep 2013 11:48:40 -0400
> > 
> > On Mon, 2013-09-23 at 11:02 +0300, Eli Zaretskii wrote:
> > > There's also another problem: you added a test script dash-w, where we
> > > already had a dash-W.  On Windows, these two map to the same file, so
> > > git overwrites the same file, and the file is always marked as
> > > "modified".  Please rename one of the files to some other name.
> > 
> > Gah.  Sorry about that.  I've pushed a change for this.  I had this
> > problem on MacOSX on another project and it can be annoying to get out
> > of it.  Let me know if you get stuck and I'll dig up my email about how
> > to fix your workspace.
> 
> I'm stuck: git won't let me pull, because it thinks one of those two
> files is modified, and "git reset" just makes the other file look
> modified.

This is what worked for me in the past with a similar situation, adapted
for the make repo:

  rm -rf test/scripts/options/dash-*
  git pull
  git reset --hard

"git status" should now show no changes.  Let me know if that doesn't
help.  You should definitely not have any local changes before you try
this ("git stash" them first if you do).