On May 7, 2013 6:03 PM, "Gordon Smith" <gosm...@adobe.com> wrote: > > However, I see some merge commits that Justin has done. So maybe they're not forbidden? > > - Gordon
I don't think we came to a consensus about this. There has been a lot of discussion about this in the past and I have no interest in starting it again. However, I suggest that if no one has objections, we all use the rebase option for a while and see if we can live with that. Thanks, Om > > -----Original Message----- > From: Gordon Smith > Sent: Tuesday, May 07, 2013 5:59 PM > To: dev@flex.apache.org > Subject: RE: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop > > I think we're back to arguing about how to use Git "properly". If merge commits are forbidden in flex-sdk, then I'll try to avoid causing them in the future. > > - Gordon > > -----Original Message----- > From: Justin Mclean [mailto:jus...@classsoftware.com] > Sent: Tuesday, May 07, 2013 5:33 PM > To: dev@flex.apache.org > Subject: Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop > > HI, > > > This is expected with pull+merge. Justin, why do you think something > > went badly wrong? > Because a commit was made that has 100's of lines changed that should not of occurred. > > Justin
