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

List:       kde-panel-devel
Subject:    Re: A (somewhat) problematic merge
From:       Luiz_Romário_Santana_Rios <luizromario () gmail ! com>
Date:       2012-11-06 4:11:56
Message-ID: CABCW-kpQy3As+v2+K4k712K+hGvGNjrkcYqpRd0adpgJkATG3g () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Disregard that, I just tried to merge the romariorios/calculator-qml branch
into master and it went fine. I still have no idea, though, of why that
wasn't working properly. Maybe I was doing something wroking.

Anyway, just ignore this email.

2012/11/6 Luiz Romário Santana Rios <luizromario@gmail.com>

> So, I've ported the Calculator applet to QML and I did it in a separate
> branch. But, as my work is based on the work already done by bettio, I
> merged his branch into mine and continued the work from there. The problem
> is that there was a lot of old stuff in his branch (it was branched from an
> old master commit), and that got into my branch unnoticed by me.
>
> Until now.
>
> I tried to merge my romariorios/calculator-qml branch directly into
> master, but quickly realized that it would bring a lot of old junk to
> master, for the aforementioned reasons. My "solution", then, was to do the
> opposite first: merge master into romariorios/calculator-qml, so that the
> rest of the tree got updated and, then, merge romariorios/calculator-qml
> into master, bringing only the relevant changes to the master tree. But I
> think that would make the commit history a bit funky.
>
> What should I do?
>
> --
> Luiz Romário Santana Rios
>

-- 
Luiz Romário Santana Rios

[Attachment #5 (text/html)]

<div class="gmail_extra"><div class="gmail_quote">Disregard that, I just tried to \
merge the romariorios/calculator-qml branch into master and it went fine. I still \
have no idea, though, of why that wasn&#39;t working properly. Maybe I was doing \
something wroking.<br>

<br>Anyway, just ignore this email.<br><br>2012/11/6 Luiz Romário Santana Rios <span \
dir="ltr">&lt;<a href="mailto:luizromario@gmail.com" \
target="_blank">luizromario@gmail.com</a>&gt;</span><br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">

So, I&#39;ve ported the Calculator applet to QML and I did it in a separate branch. \
But, as my work is based on the work already done by bettio, I merged his branch into \
mine and continued the work from there. The problem is that there was a lot of old \
stuff in his branch (it was branched from an old master commit), and that got into my \
branch unnoticed by me.<br>


<br>Until now.<br><br>I tried to merge my romariorios/calculator-qml branch directly \
into master, but quickly realized that it would bring a lot of old junk to master, \
for the aforementioned reasons. My &quot;solution&quot;, then, was to do the opposite \
first: merge master into romariorios/calculator-qml, so that the rest of the tree got \
updated and, then, merge romariorios/calculator-qml into master, bringing only the \
relevant changes to the master tree. But I think that would make the commit history a \
bit funky.<br>


<br>What should I do?<span class="HOEnZb"><font color="#888888"><br \
clear="all"><br>-- <br>Luiz Romário Santana Rios</font></span><br \
clear="all"></blockquote></div><br>-- <br>Luiz Romário Santana Rios<br> </div>



_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel


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