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

List:       enlightenment-devel
Subject:    Re: [E-devel] [EGIT] [core/elementary] elementary-1.14 01/02: Merge branch 'elementary-1.14' of git+
From:       Stefan Schmidt <stefan () osg ! samsung ! com>
Date:       2015-05-21 7:45:48
Message-ID: 555D8D2C.1060106 () osg ! samsung ! com
[Download RAW message or body]

Hello.

On 19/05/15 16:10, Stefan Schmidt wrote:
> Hello.
>
> On 19/05/15 15:04, ChunEon Park wrote:
>> mistook. :p
> This is not a simple mistake. Did you actually ever looked at what you
> are going to push? A git log or gitk would have showed you that your
> merge commit brought the whole elementary master branch with it. All
> sitting in the stable branch now.
>
> What a mess.
>
> I reverted that merge now and left only the chances in place which have
> been backported. Have a look and verify that these should be in the
> stable branch.
>
> And always use git log or gitk before you are pushing to see what you
> are actually pushing. It would have shown you that you have a merge,
> that you have two commits in you do not want and revert a few minutes
> later and it would also have shown you that you merged the whole master
> branch into stable.

Hmm, no reaction at all. I hope you realize what problem you created 
here. Did you have a chance to see if all the changes you wanted to be 
in now and all other are not?

regards
Stefan Schmidt


------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud 
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[prev in list] [next in list] [prev in thread] [next in thread]