SAY-5 opened a new pull request, #9010: URL: https://github.com/apache/hop/pull/9010
When a merge ran into conflicts, the `.theirs` copies were looked up with the merged name as a branch, so merging a tag first showed an error dialog from the failed ref lookup, and an annotated tag then failed with a ClassCastException because `resolve()` cast the tag object to a commit. The conflicting files are now read from the object that was merged and `resolve()` peels annotated tags through `parseCommit`, so the conflict message and the `.ours`/`.theirs` copies appear for tags as they do for branches. Addresses #8937. ------------------------ Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Run `mvn clean install apache-rat:check` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [x] If you have a group of commits related to the same change, please squash your commits into one and force push your branch using `git rebase -i`. - [x] Mention the appropriate issue in your description (for example: `addresses #123`), if applicable. To make clear that you license your contribution under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0) you have to acknowledge this by using the following check-box. - [x] I hereby declare this contribution to be licensed under the [Apache License Version 2.0, January 2004](http://www.apache.org/licenses/LICENSE-2.0) - [ ] In any other case, please file an [Apache Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). -- 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]
