Skip to content

Conversation

@jstasiak
Copy link
Contributor

The file uses /* */ comment style and I unintentionally went against that.

Fixes: ee4bf04 ("Handle non-UTF-8 device models")

Copy link
Contributor

@bcl bcl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

Copy link
Owner

@dcantrell dcantrell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@dcantrell
Copy link
Owner

I approve but I'm all over the place approving and merging PRs, can you resolve the conflicts so I can merge this one?

@jstasiak
Copy link
Contributor Author

Yup, done – not sure how I missed the semicolon problem in the original PR (the fix for which caused conflicts here), oh well.

@dcantrell
Copy link
Owner

Can't merge, still has conflicts. You need to update your fork from main and resolve those conflicts. Sorry.

@jstasiak
Copy link
Contributor Author

Hmm, this is what I'm seeing:

*   7382fb4b4f24 - (jstasiak/fix-comment-style, fix-comment-style) Merge branch 'main' into fix-comment-style (2025-01-24 20:41:34 +0100) <Jakub Stasiak>
|\  
| * 68fdb5e1825c - (HEAD -> main, origin/main, origin/HEAD) tests: Test to make sure partition and disk names match libparted (2025-01-24 14:36:43 -0500) <Brian C. Lane>
| * e9b77e21f059 - Add a missing semicolon. (2025-01-24 14:33:15 -0500) <Kirill Spitsyn>
| * c2f8d2dc06d5 - workflows: Using main instead of master (2025-01-21 13:30:17 -0500) <Brian C. Lane>
* | 8e128a18daba - Fix comment style consistency (2025-01-17 20:35:49 +0100) <Jakub Stasiak>
|/  
* ee4bf04168e5 - Handle non-UTF-8 device models (2025-01-17 13:59:08 -0500) <Jakub Stasiak>

@dcantrell
Copy link
Owner

GitHub says "This branch cannot be rebased due to conflicts" and has greyed out the Rebase and merge button. I'm confused!

¯_(ツ)_/¯

@jstasiak
Copy link
Contributor Author

Oh wait, you're trying to rebase? It may not work with the merge commit in the branch, do you mind if I just force-push a fresh commit here?

@bcl
Copy link
Contributor

bcl commented Jan 24, 2025

Yeah, there should be no merge commit. They're evil :) Just rebase that one commit on top of main and force push the branch.

The file uses /* */ comment style and I unintentionally went against that.

Fixes: ee4bf04 ("Handle non-UTF-8 device models")
@jstasiak
Copy link
Contributor Author

Yeah fair enough, should be cleaned up now.

@dcantrell dcantrell merged commit 8fe351b into dcantrell:main Jan 24, 2025
1 check passed
@jstasiak jstasiak deleted the fix-comment-style branch January 24, 2025 23:53
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.

3 participants