-
Notifications
You must be signed in to change notification settings - Fork 296
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
Proposing: removing lines with more than one statements. (v2.10) #1118
Merged
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
Iximiel
force-pushed
the
v2.10-astyle
branch
from
November 18, 2024 14:54
d80912c
to
16fb94e
Compare
* formatted astyle.sh + removed shellcheck warnings * restyle v2.9 * added .git-blame-ignore-revs file --------- Co-authored-by: Daniele Rapetti <5535617+Iximiel@users.noreply.github.com>
@Iximiel is this the next step to merge v2.9? |
yes, but I need to "rebase it" to the current v2.10 before proceeding, and could be smarter to do that from a new branch, tomorrow around 9 I'm giving you the thing ready to be merged |
…med#1114)" (plumed#1178) This reverts commit ea3b17f.
Proposing: removing lines with more than one statements. for 2.9
@carlocamilloni |
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.
Description
see the discussion in #1114
since a lot of code changed, and some files where deleted from 2.9 pre-reformatting before the merge from 2.9 should make the merge less painful
Merging into master I think will be far easier
Target release
I would like my code to appear in release v2.10
Type of contribution
Copyright
COPYRIGHT
file with the correct license information. Code should be released under an open source license. I also used the commandcd src && ./header.sh mymodulename
in order to make sure the headers of the module are correct.Tests