When updating my local checkout, I just got a conflict in doc/spec/polkit-spec.html. But I never touched that file. It looks like it's generated at build time. In my opinion, generated files shouldn't be in the repository. I'm attaching the diff of the conflict, in case it's relevant.
Created attachment 5957 [details] [review] Conflicting parts
This bug report is for the old version of PolicyKit. Closing as all of the code has been rewritten. Please reopen if the bug report applies to the latest version of PolicyKit. Thanks.
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.