Hi Carlos,
This merge you did make me think I didn't talk about this case on the wiki
[1], so I updated it, in short, while it is good to start a branch as you
did for a new jira ticket and as you may don't know the final number of
commits you will have at the end, once it is the time to merge, you know the
number of commits you did, if you realize you've got only one, it is better
to do a 'git rebase <my_branch>' instead of a 'git merge --no-ff
<my_branch>, the reason behind that is that you can avoid the extra merge
commit, practically nothing change, except you will have a flat history
which is what we want for only one commit and it could be reverse/reset the
same if needed.
Thanks,
-Fred
[1] https://cwiki.apache.org/confluence/display/FLEX/Good+vs+Bad+Git+usage
-----Message d'origine-----
From: carlosrov...@apache.org
Sent: Wednesday, March 27, 2013 3:12 AM
To: comm...@flex.apache.org
Subject: [2/2] git commit: Merge branch 'FLEX-33349' into develop
Merge branch 'FLEX-33349' into develop
* FLEX-33349:
Fix TypeError #1009 happening in dataProviderRefreshed() of List.as after
refreshing the dataProvider of Combobox.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/39fdf7fa
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/39fdf7fa
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/39fdf7fa
Branch: refs/heads/develop
Commit: 39fdf7fa81329fa60eb95efc374375a901c34d3d
Parents: 6282657 5ca083e
Author: Carlos Rovira <carlos.rov...@gmail.com>
Authored: Wed Mar 27 03:12:08 2013 +0100
Committer: Carlos Rovira <carlos.rov...@gmail.com>
Committed: Wed Mar 27 03:12:08 2013 +0100
----------------------------------------------------------------------
.../projects/spark/src/spark/components/List.as | 23 +++++++++++----
1 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
