Github user adufilie commented on the pull request:
https://github.com/apache/flex-falcon/pull/5#issuecomment-169367688
I noticed that there was no merge commit after applying the patch. On the
"Git for Apache Flex Guide"
(https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide) it
links to a description of your branching model
(http://nvie.com/posts/a-successful-git-branching-model/) which suggests using
"git merge --no-ff" to preserve the merge history and make it easier to roll
back. "git pull --no-ff" would also work, but revert is needed if you do it
multiple times.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
