Re: strange temporary pull-errors

Oliver Kullmann wrote:

quoted

git pull

[...]

error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot merge.

[...]

quoted

git status

[...]

nothing to commit (working directory clean)

quoted

git pull

[succeeds]

There is nothing special going out, the simple pull should succeed, but
I have to try several times; don't know whether the "git status" is
instrumental here or not --- will try the next time.

Saying 'git status' refreshes the index.  If you have touched (updated
mtime) local_html.mak without making any changes, 'git merge' just
compared the mtime and considered the file changed.  But 'git status'
actually compares the contents and finds it has not been changed.  I
don't know whether 1.6 (most likely builtin-merge) changed behaviour
in this respect, maybe you could try with an older version too.

There are other cases where you need a refresh, for example if you
have made a copy of a git-tracked directory with 'cp -r'.

- Thomas

-- 
Thomas Rast
trast@student.ethz.ch