trafodion-codereview mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From EEDY <...@git.apache.org>
Subject [GitHub] incubator-trafodion pull request #1301: new COMMENT-ON SQL statement: resolv...
Date Thu, 16 Nov 2017 04:06:38 GMT
GitHub user EEDY opened a pull request:

    https://github.com/apache/incubator-trafodion/pull/1301

    new COMMENT-ON SQL statement: resolve merge conflict

    1. resolve enum type conflict while merging to esgyn
    
    Compiled and test.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/EEDY/incubator-trafodion master

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-trafodion/pull/1301.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 #1301
    
----
commit ad6d7350cef85de36e4af0cf035f1e557054aec4
Author: eedy <cqlcqlc@gmail.com>
Date:   2017-11-16T04:04:33Z

    new COMMENT-ON SQL statement: resolve merge conflict
    
    1. resolve enum type conflict while merging to esgyn

----


---

Mime
View raw message