rahil-c commented on PR #14355: URL: https://github.com/apache/hudi/pull/14355#issuecomment-3632895550
@the-other-tim-brown was seeing the following classes say merge conflict before I did recent changes <img width="2688" height="1078" alt="Screenshot 2025-12-09 at 7 15 00 AM" src="https://github.com/user-attachments/assets/c6da9b54-514d-48cb-990b-84f71c4cdc95"; /> When doing `git rebase master` it actually gave me a much harder time when number of conflicts for some reason so opted for the usual `git merge master` instead. The differences should be minor and there is a second commit I made `resolve minor things from merge` which fixes the things brought from merged master. -- 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]
