sunnysabor commented on PR #7360: URL: https://github.com/apache/shenyu/pull/7360#issuecomment-5935768629
I checked the current conflict against `upstream/master` (`09c6a528`) and PR head `b580baad2` with `git merge-tree`. The only conflicts are the five 2.7.1-to-2.7.2 upgrade files for MySQL, OceanBase, openGauss, Oracle, and PostgreSQL; the five corresponding initialization schemas and the Java/XML/test files auto-merge. The conflicting hunks are both adding indexes to the same migration sections: this PR's snapshot/permission indexes and #7404's operation-log indexes. When resolving, preserve both independent index sets and retain this PR's PostgreSQL/openGauss `IF NOT EXISTS` form. No production or test conflict was reported by the merge-tree check. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
