317brian commented on PR #516: URL: https://github.com/apache/druid-website-src/pull/516#issuecomment-2669833382
You need to resolve the conflicts. To resolve the conflicts, you can use either the files from your branch or `master`. When I republish the website after your fixes get merged, the files that are in conflict eright now are going to get overwritten anyway. -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
