Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
hpc-compendium
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ZIH
hpcsupport
hpc-compendium
Commits
0ce13104
Commit
0ce13104
authored
3 years ago
by
Martin Schroschk
Browse files
Options
Downloads
Plain Diff
Merge branch 'she' into 'preview'
Replace she See merge request
!545
parents
06c40f66
fcb7bf86
No related branches found
Branches containing commit
No related tags found
2 merge requests
!552
Merge to main
,
!545
Replace she
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
doc.zih.tu-dresden.de/docs/contrib/contribute_container.md
+9
-9
9 additions, 9 deletions
doc.zih.tu-dresden.de/docs/contrib/contribute_container.md
with
9 additions
and
9 deletions
doc.zih.tu-dresden.de/docs/contrib/contribute_container.md
+
9
−
9
View file @
0ce13104
...
...
@@ -59,16 +59,16 @@ from internal merge requests. Because branches of forks are not automatically ch
someone with at least developer access needs to do some more steps to incorporate the changes of
your MR:
1.
S
he informs you about the start of merging process.
1.
S
he needs to review your changes to make sure that your changes are specific and don't introduce
1.
T
he
developer
informs you about the start of merging process.
1.
T
he
developer
needs to review your changes to make sure that your changes are specific and don't introduce
problems, such as changes in the Dockerfile or any script could.
1.
S
he needs to create a branch in our repository. Let's call this "internal MR branch".
1.
S
he needs to change the target branch of your MR from "preview" to "internal MR branch".
1.
S
he needs to merge it.
1.
S
he needs to open another MR from "internal MR branch" to "preview" to check whether
the changes
pass the CI checks.
1.
S
he needs to fix things that were found by CI.
1.
S
he informs you about the MR or asks for your support while fixing the CI.
1.
T
he
developer
needs to create a branch in our repository. Let's call this "internal MR branch".
1.
T
he
developer
needs to change the target branch of your MR from "preview" to "internal MR branch".
1.
T
he
developer
needs to merge it.
1.
T
he
developer
needs to open another MR from "internal MR branch" to "preview" to check whether
the changes
pass the CI checks.
1.
T
he
developer
needs to fix things that were found by CI.
1.
T
he
developer
informs you about the MR or asks for your support while fixing the CI.
When you follow our
[
content rules
](
content_rules.md
)
and
[
run checks locally
](
#run-the-proposed-checks-inside-container
)
, you are making this process
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment