Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix clang format conflicts un unchecked policy branch #1789

Merged
merged 26 commits into from
Feb 18, 2025

Conversation

MrBurmark
Copy link
Member

@MrBurmark MrBurmark commented Feb 10, 2025

Fix merge conflicts caused by clang format changes

@artv3
Copy link
Member

artv3 commented Feb 10, 2025

This PR has a large number of small changes, notably the date changes. I thought dates had been previously updated?

@MrBurmark MrBurmark changed the title Fix clang format conflicts Fix clang format conflicts un unchecked policy branch Feb 10, 2025
@MrBurmark
Copy link
Member Author

This is mainly to make sure that we're happy with the way the merge conflicts were handled, but there are too many formatting changes in this PR to actually look at that. I'm trying to figure out the failing test, but I'll close this for now.

@MrBurmark MrBurmark changed the base branch from feature/burmark1/unchecked_policies to develop February 10, 2025 18:49
@MrBurmark
Copy link
Member Author

I changed the base to develop to better see the changes.

@MrBurmark MrBurmark requested a review from artv3 February 10, 2025 18:51
@MrBurmark
Copy link
Member Author

@artv3 can you double check that this has all the policies that you think it should have? I'm pretty sure that this has strictly more than existed before.

@MrBurmark
Copy link
Member Author

MrBurmark commented Feb 10, 2025

This is failing a test due to this issue and hopefully not anything intrinsic to these changes. #1733
I'll work on fixing that as well.

@MrBurmark MrBurmark requested review from artv3, rchen20 and a team and removed request for artv3 and rchen20 February 14, 2025 21:15
@MrBurmark MrBurmark merged commit df10eff into develop Feb 18, 2025
27 checks passed
@MrBurmark MrBurmark deleted the task/rhornung/clang-format-conflicts branch February 18, 2025 23:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants