| ... | ... | @@ -8,7 +8,7 @@ In a nutshell (click the individual steps for detailed guidelines): |
|
|
|
--> C(Expert Discussion)
|
|
|
|
--> D(Concept development)
|
|
|
|
--> E(Concept Implementation)
|
|
|
|
--> F(Review and merge)
|
|
|
|
--> F(Review and merge);
|
|
|
|
click B "/simulation/wiki/-/wikis/docs/git/Workflow#create-an-issue" "d"
|
|
|
|
click B1 "/simulation/wiki/-/wikis/docs/git/Workflow#issue-review" "d"
|
|
|
|
click C "/simulation/wiki/-/wikis/docs/git/Workflow#expert-discussion" "a"
|
| ... | ... | @@ -52,6 +52,7 @@ Next steps include (in no particular order): |
|
|
|
- See [this cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) for tips and tricks for comment formatting
|
|
|
|
- Additionally, refer to the full documentation - Make sure to click the right link for the platform [GitHub](https://docs.github.com/en/free-pro-team@latest/github/writing-on-github) / [GitLab (code.asam.net)](https://docs.gitlab.com/ee/user/markdown.html)
|
|
|
|
|
|
|
|
>**If there are open questions to other groups or project members - open another issue and assign it to the group/participant.** Label it as you would any other issue, making sure to give it the correct label for the other group. Issues can be linked to the original issue via [Related Issues](https://docs.gitlab.com/ee/user/project/issues/related_issues.html) to make it easy to keep track of the relationships.
|
|
|
|
|
|
|
|
## Concept development
|
|
|
|
|
| ... | ... | @@ -63,7 +64,6 @@ Some tips: |
|
|
|
- Commit and push/pull regularly to prevent headaches!
|
|
|
|
- Use clear commit messages to make sure others understand what you have been doing! (see [Commit Guidelines](../git/Commit-Guidelines))
|
|
|
|
- See [Resolving Merge Conflicts](../git/Resolving-Merge-Conflicts) for some tips if you have problems with pushing/pulling to a branch
|
|
|
|
- **If there are open questions to other groups or project members - open another issue and assign it to the group/participant! Issues can be linked to the original issue via [Related Issues](https://docs.gitlab.com/ee/user/project/issues/related_issues.html) to make it easy to keep track.**
|
|
|
|
> Project members for ASAM projects are able to branch directly (see [How to create a Branch](./Branching)). Non-project members will need to use the fork & PR process (see [Forking](./Forking))
|
|
|
|
|
|
|
|
# Concept Implementation
|
| ... | ... | |
