> > > 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.
- Re: [2/7] git commit: [flex-sdk] [refs/he... Justin Mclean
- RE: [2/7] git commit: [flex-sdk] [ref... Gordon Smith
- RE: [2/7] git commit: [flex-sdk] [ref... Gordon Smith
- Re: [2/7] git commit: [flex-sdk]... Justin Mclean
- RE: [2/7] git commit: [flex-sdk]... OmPrakash Muppirala
- Re: [2/7] git commit: [flex-... Justin Mclean
- Re: [2/7] git commit: [flex-... OmPrakash Muppirala
- Re: [2/7] git commit: [flex-... Justin Mclean
- Re: [2/7] git commit: [flex-... Alex Harui
- Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] ... Dasa Paddock
- Re: [2/7] git commit: [flex-sdk] [refs/heads/deve... OmPrakash Muppirala
- RE: [2/7] git commit: [flex-sdk] [refs/heads/... Gordon Smith
- Re: [2/7] git commit: [flex-sdk] [refs/he... Justin Mclean