strange temporary pull-errors

From: Oliver Kullmann <o.kullmann@swansea.ac.uk>
Date: Aug 22, 2008, 19:13 UTC
Message-ID: <20080822191324.GO10819@cs-wsok.swansea.ac.uk>

Hi,

again and again (first I ignored it) I get the following with version 1.6.0:

> git pull

remote: Counting objects: 55, done.
remote: Compressing objects: 100% (31/31), done.
remote: Total 34 (delta 10), reused 24 (delta 3)
Unpacking objects: 100% (34/34), done.
From /h/21/GemeinsameBasis/SAT-Algorithmen/OKplatform/OKsystem/Transitional/
   d69da9e..d9b9324  master     -> origin/master
Updating 688e3cb..d9b9324
error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot mer
ge.

> git pull

Updating 688e3cb..d9b9324 error: Entry 'Buildsystem/Configuration/Html/local_html.mak' not uptodate. Cannot mer ge.

> git status

# On branch master # Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded. # nothing to commit (working directory clean)

> git pull

Updating 688e3cb..d9b9324
Fast forward
 Buildsystem/Configuration/Html/local_html.mak      |    3 +
 .../Configuration/ReleaseProcess/ReleaseHistory    |    1 +
 Buildsystem/Html/Local/History.html                |   11 +++-
 Buildsystem/Html/Local/PackageHistory.html         |   52 ++++++++++++++++++++
 Buildsystem/Html/Local/plans/History.hpp           |    2 +-
 Buildsystem/Html/Local/plans/milestones.hpp        |    4 +-
 Buildsystem/OKlibBuilding/Targets/html/Makefile    |    1 +
 Buildsystem/ReleaseProcess/README                  |    9 +++-
 Buildsystem/ReleaseProcess/plans/general.hpp       |    5 +-
 Buildsystem/ReleaseProcess/plans/milestones.hpp    |    4 +-
 plans/general.hpp                                  |    7 ++-
 11 files changed, 87 insertions(+), 12 deletions(-)
 create mode 100644 Buildsystem/Html/Local/PackageHistory.html

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.

Oliver