Rewrote string concatenation/format with f strings #2597
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There is a style violation in this PR. |
|
Look at the failed test. |
|
Changes done |
|
The changes look OK, but they need to be reconciled against the changes just merged. |
DomHeadroom
force-pushed
the
master
branch
2 times, most recently
from
9dd8336 to
0cd602b
Compare
|
If I try to update one of the 4 files manually to the latest version and fix the conflicts in intellij, the problems still remain, and I can't fix them from the web-ui because I don't have write permission on the repo |
|
Generally pull requests are done outside of your master branch. What you may have to do is create a local branch for the PR, download the current version of Solaar in your master branch, and fix the conflicts locally before updating your PR. |
|
This PR appears to have been overtaken by other merges and needs to be updated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.