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

Proposing: removing lines with more than one statements. (v2.10) #1118

Merged
merged 13 commits into from
Jan 17, 2025

Conversation

Iximiel
Copy link
Member

@Iximiel Iximiel commented Oct 4, 2024

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
  • changes to code or doc authored by PLUMED developers, or additions of code in the core or within the default modules
  • changes to a module not authored by you
  • new module contribution or edit of a module authored by you
Copyright
  • I agree to transfer the copyright of the code I have written to the PLUMED developers or to the author of the code I am modifying.
  • the module I added or modified contains a COPYRIGHT file with the correct license information. Code should be released under an open source license. I also used the command cd src && ./header.sh mymodulename in order to make sure the headers of the module are correct.
Tests
  • I added a new regtest or modified an existing regtest to validate my changes.
  • I verified that all regtests are passed successfully on GitHub Actions.

@Iximiel Iximiel marked this pull request as ready for review October 4, 2024 07:18
@Iximiel Iximiel marked this pull request as draft November 19, 2024 08:19
Iximiel and others added 2 commits January 16, 2025 18:58
* 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>
@carlocamilloni
Copy link
Member

@Iximiel is this the next step to merge v2.9?

@Iximiel
Copy link
Member Author

Iximiel commented Jan 16, 2025

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

@Iximiel
Copy link
Member Author

Iximiel commented Jan 17, 2025

@carlocamilloni
Ready to go, for this better use a plain merge

@Iximiel Iximiel marked this pull request as ready for review January 17, 2025 09:07
@carlocamilloni carlocamilloni merged commit 29c3fd1 into plumed:v2.10 Jan 17, 2025
4 of 18 checks passed
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