Minor git hickups

[UWN]

ulrich@p0:/opt/gupu/gprolog$ git status
On branch master
Your branch is up-to-date with 'origin/master'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)

    src/EnginePl/cpp_headers

nothing added to commit but untracked files present (use "git add" to track)

And before:

ulrich@p0:/opt/gupu/gprolog$ git pull
remote: Enumerating objects: 37, done.
remote: Counting objects: 100% (37/37), done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 19 (delta 18), reused 19 (delta 18), pack-reused 0
Unpacking objects: 100% (19/19), done.
From https://github.com/didoudiaz/gprolog
   004cbf1..d9333a3  master     -> origin/master
Updating 004cbf1..d9333a3
error: Your local changes to the following files would be overwritten by merge:
    src/Pl2Wam/wam_emit.wam
Please, commit your changes or stash them before you can merge.
Aborting
ulrich@p0:/opt/gupu/gprolog$ git reset --hard

which solved it.

[didoudiaz]

You can remove src/EnginePl/cpp_headers file. Errors in .wam are generally not important: these files are generated file but initially needed for bootstrapping. They contain pathnames of Prolog compiled predicates (for predicate_property mainly, so not very important).