flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Harui <aha...@adobe.com>
Subject Re: [OT] Log history
Date Thu, 21 Mar 2013 06:19:06 GMT
OK, so we should always do a pull --rebase before pushing?

Is there any time we should not do that?


On 3/20/13 10:55 PM, "Frédéric THOMAS" <webdoublefx@hotmail.com> wrote:

> Hi guys,
> 
> I would like to bring to your attention that after 3 'git push', the log
> history looks already exotic, nobody did branches but it looks like there
> are [1].
> 
> Given nobody worked on a branch and did a merge --no-ff, we should have a
> flat graph: eveything pushed on top of what the others did.
> It is not the case because the 2 last persons who pushed didn't do a
> pull --rebase first, if you don't want to use pull --rebase because of have
> a "local merged branch not yet pushed" and don't want it to be re-writen by
> the rebase operation, you can "git pull --ff-only", it will gives you an
> error if they are commits ahead of your local head and then do a "git
> rebase -p origin/develop" to preserve your merged branch commit to be
> re-writen.
> 
> Thanks,
> -Fred
> 
> [1]
> * 7e6fe20 2013-03-21 | Added support for Flash Player 11.7 (HEAD,
> origin/develop, develop) [Justin Mclean]
> *   8392018 2013-03-21 | Merge branch 'develop' of
> https://git-wip-us.apache.org/repos/asf/flex-sdk into develop [Justin
> Mclean]
> |\
> | * f292ce0 2013-03-20 | added 38 Mustella tests for CallOutButton and
> removed a not existing skin  CallOutArrowSkin in defaults.css [cyrill
> 
> | * bbb75ce 2013-03-20 | FLEX-33350 adding CallOut components to
> experimental project - component patch by Marcus Fritze        . [cyrill.za
> 
> | *   3016ec4 2013-03-20 | moved new components Accordion, DataAccordion,
> InlineScroller .. new layouts AccordionLayout, CarouselLayout, Cov
> 
> | |\
> | | * 0d3bf3b 2013-03-19 | moved new components Accordion, DataAccordion,
> InlineScroller .. new layouts AccordionLayout, CarouselLayout, Cov
> 
> * | | 3461a16 2013-03-21 | Added support for Flash Player 11.7 and AIR 3.7.
> Updated FP 11.6 playerglobal.swc MD5 [Justin Mclean]
> |/ /
> * |   4f6c47d 2013-03-19 | Merge branch 'develop' of
> https://git-wip-us.apache.org/repos/asf/flex-sdk into develop [Justin
> Mclean]
> |\ \
> | |/
> | * b5fce93 2013-03-19 | FLEX-33435 added more details [Frédéric THOMAS]
> | * 9c7c97e 2013-03-19 | Updated for the Svn to Git migration [Frédéric
> THOMAS]
> * | 85af480 2013-03-19 | Added el_GR locale for postcodes [Justin Mclean]
> * | 63580a8 2013-03-19 | Adding more datagrid double click modes [Justin
> Mclean]
> |/
> * c5869e4 2013-03-19 | Added nl_NL locale for postcode validator [Justin
> Mclean]
> *   cbfeae5 2013-03-19 | Merge branch 'develop' of
> https://git-wip-us.apache.org/repos/asf/flex-sdk into develop [Justin
> Mclean]
> |\
> | * 5e15ba8 2013-03-18 | OS X specific entry for flex-tlf link [Erik de
> Bruin]
> * | f825b4a 2013-03-19 | Added fi_FI locale for postcode validator [Justin
> Mclean]
> |/
> * 35c5fbd 2013-03-18 | Added ru_RU locale for postcode validator [Justin
> Mclean]
> * fc57407 2013-03-18 | Added pt_PT postcode validator strings [Justin
> Mclean]
> * 8645f87 2013-03-18 | Added pt_BR postcode validator strings [Justin
> Mclean]
> * 2d41d85 2013-03-18 | Added ja_JP postcode validator strings [Justin
> Mclean]
> * 8b9c4a6 2013-03-18 | Added de_DE postcode validator strings [Justin
> Mclean]
> * 077c87e 2013-03-17 | The files/directories to exclude while checkin
> [Frédéric THOMAS]
> * a099d6a 2013-03-11 | added instruction on how to buil framework RSLs if
> they don't exits [Justin Mclean]
> * 3d2092d 2013-03-11 | Fix RTE in ComboBox as described in FLEX-33414.
> Mustella ComboBox tests pass. [Justin Mclean]
> * a364811 2013-03-11 | removed shell as needed on windows [Justin Mclean]
> * 390831f 2013-03-10 | Fix RTE described in FLEX-33385. titeText is optional
> part. [Justin Mclean]
> * bcdf552 2013-03-10 | Less strict typing to stop RTE as described
> FLEX-33405 [Justin Mclean]
> * c226e84 2013-03-09 | Added my public key [Frédéric Thomas]
> * eef6a6c 2013-03-07 | Removed duplicate experimental targets and fixed
> textLayut_rb output swc. Is this file used any more? [Justin Mclean]
> 
> * aaf34fd 2013-03-07 | Tiny bit of cleanup I noticed while reading the code.
> [Carol Frampton]
> * 6791729 2013-03-06 | Revert last change which shouldn't have been
> submitted. [Carol Frampton]
> * 7c3caab 2013-03-06 | Fix up a few errors in the method headers. [Carol
> Frampton]
> * c4432ef 2013-03-06 | Refix FLEX-33417 correctly. [Carol Frampton]
> * 255743f 2013-03-05 | FLEX-33417.  core.swc doesn't link correctly if
> playerglobal.swc is included in compile-config.xml rather than direct
> 

-- 
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui


Mime
View raw message