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
04b47390
Commit
04b47390
authored
3 years ago
by
Jan Frenzel
Browse files
Options
Downloads
Patches
Plain Diff
Added process of incorporating MR from forked repo into
contribute_container.md.
parent
4e650111
No related branches found
No related tags found
2 merge requests
!542
Automated merge from preview to main
,
!540
Added process of incorporating MR from forked repo into contribute_container.md.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
doc.zih.tu-dresden.de/docs/contrib/contribute_container.md
+31
-5
31 additions, 5 deletions
doc.zih.tu-dresden.de/docs/contrib/contribute_container.md
with
31 additions
and
5 deletions
doc.zih.tu-dresden.de/docs/contrib/contribute_container.md
+
31
−
5
View file @
04b47390
...
@@ -42,11 +42,37 @@ description of your changes. If you work on an issue, please also add "Closes 17
...
@@ -42,11 +42,37 @@ description of your changes. If you work on an issue, please also add "Closes 17
`git push origin 174-check-contribution-documentation`
.
`git push origin 174-check-contribution-documentation`
.
1.
As an output you get a link to create a merge request against the preview branch.
1.
As an output you get a link to create a merge request against the preview branch.
1.
When the merge request is created, a continuous integration (CI) pipeline automatically checks
1.
When the merge request is created, a continuous integration (CI) pipeline automatically checks
your contributions.
your contributions. If you forked the repository, these automatic checks are not available, but you
can
[
run checks locally
](
#run-the-proposed-checks-inside-container
)
.
When you contribute, please follow our
[
content rules
](
content_rules.md
)
to make incorporating your
changes easy. We also check these rules via continuous integration checks and/or reviews.
!!! tip
You can find the details and commands to preview your changes and apply checks in the next sections.
When you contribute, please follow our [content rules](content_rules.md) to make incorporating
your changes easy. We also check these rules via continuous integration checks and/or reviews.
You can find the details and commands to [preview your changes](#start-the-local-web-server) and
[apply checks](#run-the-proposed-checks-inside-container).
## Merging of Forked Repositories
When you have forked the repository as mentioned above, the process for merging is a bit different
from internal merge requests. Because branches of forks are not automatically checked by CI,
someone with at least developer access needs to do some more steps to incorporate the changes of
your MR:
1.
She informs you about the start of merging process.
1.
She 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.
She needs to create a branch in our repository. Let's call this "internal MR branch".
1.
She needs to change the target branch of your MR from "preview" to "internal MR branch".
1.
She needs to merge it.
1.
She needs to open another MR from "internal MR branch" to "preview" to check whether the changes
pass the CI checks.
1.
She needs to fix things that were found by CI.
1.
She 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
faster.
## Tools to Ensure Quality
## Tools to Ensure Quality
...
...
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