[ https://issues.apache.org/jira/browse/EAGLE-589?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15546746#comment-15546746 ]
ASF GitHub Bot commented on EAGLE-589: -------------------------------------- GitHub user RalphSu opened a pull request: https://github.com/apache/incubator-eagle/pull/474 [EAGLE-589] : PR 472 incorrect merge of pr 471 Due to last commit, there is incorrect merge which get out of awareness. Do this fix PR. You can merge this pull request into a Git repository by running: $ git pull https://github.com/RalphSu/incubator-eagle master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-eagle/pull/474.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #474 ---- commit 6d39a4cc998465ab0dd3d0701733521b26b91509 Author: Ralph, Su <suliang...@gmail.com> Date: 2016-10-04T21:29:51Z [EAGLE-589] : PR 472 incorrect merge of pr 471 ---- > PR 472 incorrect merge of pr 471 > -------------------------------- > > Key: EAGLE-589 > URL: https://issues.apache.org/jira/browse/EAGLE-589 > Project: Eagle > Issue Type: Bug > Affects Versions: v0.5.0 > Reporter: Su Ralph > Assignee: Su Ralph > Fix For: v0.5.0 > > > An incorrect hurry merge of pr when work in mid night mode.. > Fix to reapply... -- This message was sent by Atlassian JIRA (v6.3.4#6332)