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. regards Stefan Schmidt > > ------------------------------------ > -Regards, Hermet- > > -----Original Message----- > From: "Tom Hacohen"<t...@osg.samsung.com> > To: "Enlightenment developer list"<enlightenment-devel@lists.sourceforge.net>; > Cc: > Sent: 2015-05-19 (화) 22:02:14 > Subject: Re: [E-devel] [EGIT] [core/elementary] elementary-1.14 01/02: Merge > branch 'elementary-1.14' of git+ssh://git.enlightenment.org/core/elementary > into elementary-1.14 > > Seriously? > > On 19/05/15 13:57, ChunEon Park wrote: >> hermet pushed a commit to branch elementary-1.14. >> >> http://git.enlightenment.org/core/elementary.git/commit/?id=943312bcec14d53edd43565ab871d59e3244273f >> >> commit 943312bcec14d53edd43565ab871d59e3244273f >> Merge: 304899e d5e0d00 >> Author: ChunEon Park <her...@hermet.pe.kr> >> Date: Tue May 19 21:52:39 2015 +0900 >> >> Merge branch 'elementary-1.14' of >> git+ssh://git.enlightenment.org/core/elementary into elementary-1.14 >> >> src/lib/elm_toolbar.c 8 +------- >> 1 file changed, 1 insertion(+), 7 deletions(-) >> > > ------------------------------------------------------------------------------ > 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 > ------------------------------------------------------------------------------ > 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 ------------------------------------------------------------------------------ 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
