On 2017-05-04 23:40, G. Sylvie Davies wrote:
> 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
it.exe reset --hard --quiet d6edcbf924697ab811a867421dab60d954ccad99 --
>
> ---
> Exit=128
> error: Entry 'basic_branching/file.txt' not uptodate. Cannot merge.
> fatal: Could not reset index file to revision
> 'd6edcbf924697ab811a867421dab60d954ccad99'.
> ---
This smells very muc
ab60d954ccad99 --
---
Exit=128
error: Entry 'basic_branching/file.txt' not uptodate. Cannot merge.
fatal: Could not reset index file to revision
'd6edcbf924697ab811a867421dab60d954ccad99'.
---
For now I've come up with an astonishing workaround: I just run "git
status" afterwards, and then
3 matches
Mail list logo