migrate archive of easyconfigs to easybuild-easyconfigs-archive#20006
Merged
boegel merged 1 commit intoeasybuilders:5.0.xfrom Mar 6, 2024
Merged
migrate archive of easyconfigs to easybuild-easyconfigs-archive#20006boegel merged 1 commit intoeasybuilders:5.0.xfrom
boegel merged 1 commit intoeasybuilders:5.0.xfrom
Conversation
Contributor
|
Hm, how can there be conflicts here. There shouldn't have been anything touching the archive right? |
Contributor
Author
|
@Micket no idea what happened, I just rebased from current |
Member
|
The conflicts were on easyconfigs that are not archived in develop, but are in the archive on the 5.0.x branch. They received edits, which were then copied over to the 5.0.x branch and that caused the conflicts. |
Contributor
boegel
approved these changes
Mar 6, 2024
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
see easybuilders/easybuild-easyconfigs-archive#2