[SM-Discuss] git merge
Arwed von Merkatz
v.merkatz at gmx.net
Sun Jun 25 06:17:26 EDT 2006
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
More information about the SM-Discuss