[SM-Discuss] git problem

Treeve Jelbert treeve at scarlet.be
Thu Jun 22 08:57:19 EDT 2006


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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.ibiblio.org/pipermail/sm-discuss/attachments/20060622/ae466a27/attachment.bin 


More information about the SM-Discuss mailing list