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.

Sign up for GitHub

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

Jump to bottom

New function #384

Merged
merged 3 commits into from
Jun 21, 2024
Merged

New function #384

merged 3 commits into from
Jun 21, 2024

Conversation

JulesKouatchou
Copy link
Contributor

  • Add a new function to handle possible conflicts when submodule files have the same name.

@JulesKouatchou JulesKouatchou added 0 diff trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.) 0 diff The changes in this pull request have verified to be zero-diff with the target branch. labels Jun 20, 2024
@JulesKouatchou JulesKouatchou requested a review from a team as a code owner June 20, 2024 18:14
@mathomp4 mathomp4 changed the base branch from main to develop June 20, 2024 18:16
@mathomp4 mathomp4 merged commit e9479dd into develop Jun 21, 2024
4 of 7 checks passed
@mathomp4 mathomp4 deleted the add_fortran_submodules branch June 21, 2024 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mathomp4 mathomp4 mathomp4 approved these changes

Assignees
No one assigned
Labels
0 diff trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.) 0 diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JulesKouatchou @mathomp4