[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: KDE/kdebase/workspace
From:       Chani <chanika () gmail ! com>
Date:       2010-12-17 19:24:35
Message-ID: AANLkTikTpknns4p=0v1EOYymrK-NMu+jyBCMMzt2-TJA () mail ! gmail ! com
[Download RAW message or body]

ahh, that probably would have helped. :) part of the problem was
actually that I used rebase syntax with the merge command... I'm
getting git-svn and pure git mixed up.

hah, I just narrowly avoided another fail; gmail's reply-to-all wants
to email *me* instead of you. ..wait, why am I using gmail, I fixed
kmail yesterday...

On Fri, Dec 17, 2010 at 5:38 PM, Oswald Buddenhagen <ossi@kde.org> wrote:
> 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.
>
>



-- 
This message brought to you by evyl bananas and the number 3.
www.chani3.com
[prev in list] [next in list] [prev in thread] [next in thread]