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
.clang-format: Update to match coding conventions #1390
base: staging
Are you sure you want to change the base?
Conversation
I think you should also merge all commits into a single one 🙏 |
Apologies if this is a dumb question, but how should we do that? We're pretty new to contributing to open source and we can't figure out how to merge them together. I've been trying to rebase them but I'm having trouble because the changes are pushed. Again sorry if this is a simple question, but we're stuck |
No worries, on your local machine run these commands:
I hope this works/helps 😅 |
84f62d6
to
ebd7555
Compare
Oh I see. I was worried about messing with the commit that merged the recent updates but I guess I didn't understand how it worked. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tbunch1 please remove the changes to pagefault64.c
, since they are not part of this pr
@tbunch1 , could you please see the comments from @StefanJum and update the PR accordingly? See also the |
Updated .clang-format to match Unikraft coding conventions Co-authored-by: Eddie Cazares <ecazares15@utexas.edu> Co-authored-by: Lindsey Bowen <lindseyb803@gmail.com> Signed-off-by: Thomas Bunch <tebunch@icloud.com>
ebd7555
to
8d7f075
Compare
Prerequisite checklist
checkpatch.uk
on your commit series before opening this PR;Base target
Additional configuration
N/A
Description of changes
Updates .clang-format to better reflect the Unikraft coding conventions.
Co-authored-by: Eddie Cazares ecazares15@utexas.edu
Co-authored-by: Lindsey Bowen lindseyb803@gmail.com
GitHub-Fixes: #975