sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

[SM-Discuss] git merge

From: Treeve Jelbert <treeve AT scarlet.be>
To: SM Discuss <sm-discuss AT lists.ibiblio.org>
Subject: [SM-Discuss] git merge
Date: Sun, 25 Jun 2006 11:08:54 +0200

I just did a 'git pull'.

where do I find merge? which spell?

found 1 common ancestor(s):
f899ebd997c596cb5174add5c0f5837a7f79259b Merge branch 'master' of
ssh://scm.sourcemage.org/smgl/grimoire
Auto-merging kde-core/kdelibs/HISTORY
merge -L HEAD/kde-core/kdelibs/HISTORY -L orig/kde-core/kdelibs/HISTORY -L
ee29fb779e51fc9bb3899f60d3d900a8a52eca73/kde-core/kdelibs/HISTORY
.merge_file_rckyIc .merge_file_eqZLQ9 .merge_file_ASdOrd:
No such file or directory
Failed to execute 'merge'. merge(1) is used as the file-level merge tool.
Is 'merge' in your path?
No merge strategy handled the merge.

--
Regards, Treeve

Attachment: pgpfupdLf4nf4.pgp
Description: PGP signature

[SM-Discuss] git merge, Treeve Jelbert, 06/25/2006
- Re: [SM-Discuss] git merge, Pieter Lenaerts, 06/25/2006
- Re: [SM-Discuss] git merge, Jaka Kranjc, 06/25/2006
  - Re: [SM-Discuss] git merge, Arwed von Merkatz, 06/25/2006