Solve the conflicts, please. And your pr in main repo, should include all new generated codes, which shouldn't pass ci based on this.
[ Full content available at: https://github.com/apache/incubator-skywalking-oal-tool/pull/7 ] This message was relayed via gitbox.apache.org for [email protected]
