>
>
> 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.

Reply via email to