Skip to Content.
Sympa Menu

sm-discuss - [SM-Discuss] git problem

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • From: Treeve Jelbert <treeve AT scarlet.be>
  • To: SM Discuss <sm-discuss AT lists.ibiblio.org>
  • Subject: [SM-Discuss] git problem
  • Date: Thu, 22 Jun 2006 14:57:19 +0200

what has gone wrong here?
It was working yesterday.


$ git pull
Unpacking 38 objects
100% (38/38) done
* refs/heads/origin: fast forward to branch 'master' of
ssh://scm.sourcemage.org/smgl/grimoire
from b04a3945da26f20cb4c1ce2279a23160e60e8654 to
b6424787278a88140e1e24b67e4162cc40443c51
Trying really trivial in-index merge...
fatal: Entry '.gitignore' would be overwritten by merge. Cannot merge.
Nope.
Merging HEAD with b6424787278a88140e1e24b67e4162cc40443c51
Merging:
23a04973e5971c6cdd20b340754047b0979ee2c9 espgs-8.15.2 (rather delayed)
b6424787278a88140e1e24b67e4162cc40443c51 forgot to delete INSTALL
found 1 common ancestor(s):
baf33dce24d80f9a1553579d4d718b91faa46ecc qemu: fix #10732
git-read-tree: fatal: Entry '.gitignore' would be overwritten by merge.
Cannot
merge.

No merge strategy handled the merge.



--
Regards, Treeve

Attachment: pgpuNt3EeS79p.pgp
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page