From kde-commits  Fri Dec 17 16:38:51 2010
From: Oswald Buddenhagen <ossi () kde ! org>
Date: Fri, 17 Dec 2010 16:38:51 +0000
To: kde-commits
Subject: Re: KDE/kdebase/workspace
Message-Id: <20101217163851.GA5652 () troll08 ! nokia ! trolltech ! de>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129260387802986

On Thu, Dec 16, 2010 at 09:29:19PM +0100, Chani Armitage wrote:
> sorry, git-svn fail. :(
> 
rebase instead of merging, otherwise you'll always produce such
artifacts.