flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adufilie <...@git.apache.org>
Subject [GitHub] flex-falcon pull request: Compiler fixes related to js.swc
Date Wed, 06 Jan 2016 15:58:38 GMT
Github user adufilie commented on the pull request:

    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

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 infrastructure@apache.org or file a JIRA ticket
with INFRA.

View raw message