sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Re: [SM-Discuss] git merge

From: Arwed von Merkatz <v.merkatz AT gmx.net>
To: sm-discuss AT lists.ibiblio.org
Subject: Re: [SM-Discuss] git merge
Date: Sun, 25 Jun 2006 12:17:26 +0200

On Sun, Jun 25, 2006 at 11:16:28AM +0200, Jaka Kranjc wrote:
> > Auto-merging kde-core/kdelibs/HISTORY
> merge is from rcs, but I doubt it would help with HISTORY files. Just edit
> it
> and remove the conflict markers.

Depends on the actual merge, but HISTORY usually fails to merge
automatically with any tool.

--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org

[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