> I agree. We seem to be getting tripped up with this kind of merge commits.
I don't agree. Merge commits are a normal feature of Git and should not cause any confusion. They can simply be ignored. There's even an option for ignoring them: git log --no-merges. - Gordon -----Original Message----- From: omup...@gmail.com [mailto:omup...@gmail.com] On Behalf Of OmPrakash Muppirala Sent: Tuesday, May 07, 2013 5:31 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 > > > This confusion could be avoided by doing a git pull --rebase on the > develop branch before pushing new commits to develop. > > --Dasa > > I agree. We seem to be getting tripped up with this kind of merge commits. git pull --rebase seems like a very attractive option at this point.
