Re: not uptodate. Cannot merge

From: Torsten Bögershausen <tboegi@web.de>
Date: May 5, 2017, 15:25 UTC
Message-ID: <8b15577d-f997-79b5-5a77-2a8c01e20cf7@web.de>
In-Reply-To: <CAAj3zPzHiwgS=2CSKP1y8zGUxHUWiq9TSeMhixeL+9ZfffY-pw@mail.gmail.com>

On 2017-05-04 23:40, G. Sylvie Davies wrote:

Show 23 quoted lines

> Hi,
> 
> My little bitbucket "cherry-pick" button is failing on Windows from a
> "git reset --hard" blowing up.
> 
> My situation:  Git-2.10.2.windows.1 / Bitbucket-4.14.3 / Windows
> 10-10.0-amd64.   But I suspect even more recent Git will have the same
> problem.
> 
> Now, I'm pretty far from Kansas here as you'll see from my "git clone"
> invocation:
> 
> git.exe clone -c core.checkStat=minimal -c core.fileMode=false -c
> core.ignoreStat=true -c core.trustctime=false -c
> core.logAllRefUpdates=false --shared
> C:\Users\gsylvie\dev\bb\target\bitbucket\home\shared\data\repositories\1
> C:\Users\gsylvie\dev\bb\target\bitbucket\home\caches\bbClones\1
> 
> 
> Right after cloning I create a ".git/info/attributes" file containing
> just this one line:
> 
> * -text

This -may- be part of the problem. In general, it is possible to add attributes on your local copy like this, but it is not recommendet, at least not from me. In general, the project should have a .gitattributes file, which belongs to the project and which travels together with push and pull. And of course, files should have been "normalized" and have LF in the repo.

In your case: What does git config core.autocrlf say?

[]