================ @@ -28,9 +29,10 @@ const uint16_t VERSION_MAJOR = 0; /// API notes file minor version number. /// /// When the format changes IN ANY WAY, this number should be incremented. -const uint16_t VERSION_MINOR = 41; // 39 for BoundsSafety; +const uint16_t VERSION_MINOR = 42; // 39 for BoundsSafety; ---------------- j-hui wrote:
You should delete the trailing comments and force the comment change on the same line. The purpose of that comment is to force a merge conflict between, say: ``` <<< const uint16_t VERSION_MINOR = 42; // 42 for FunctionTableKey object selectors --- const uint16_t VERSION_MINOR = 41; // 41 for FunctionTableKey parameters === const uint16_t VERSION_MINOR = 42; // 42 for something else >>> ``` https://github.com/llvm/llvm-project/pull/216148 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
