Skip to content

Workflow · Changes

Page history
Update Workflow authored by Benjamin ENGEL (ASAM)'s avatar Benjamin ENGEL (ASAM)
Hide whitespace changes
Inline Side-by-side
docs/git/Workflow.md
View page @ f430a97b
......@@ -74,11 +74,21 @@ This indicates to the assignee, that the concept is ready for their review and f
## Concept Review
Should the developed concept not be concise or clear enough for the assignee to implement, the status is changed back to ~Concept and reassigned to the project group responsible for developing it. Ensure that the final commit message (for projects with squash merge commits) or the MR title adhere to the [Commit Guidelines](/docs/git/Commit-Guidelines).
Should the developed concept not be concise or clear enough for the assignee to implement, the status is changed back to ~Concept and reassigned to the group or individual responsible for developing it. Ensure that the final commit message (for projects with squash merge commits) or the MR title adhere to the [Commit Guidelines](/docs/git/Commit-Guidelines).
See [Danger Checks](/docs/git/Danger-Commit-Checks) for the automated process of checking commit messages on ASAM repositories. Github is still a WIP.
# Review and merge
Once the implemented concept is ready for review, a Merge Request [Pull Request] is opened and assigned to the original responsible for the issue. The assignee shall review the implementation for technical accuracy to ensure nothing is lost in translation. The MR must be approved by this assignee and the WIP status of the MR (if present) removed. The CCB performs a final review of the content and merges the MR. The CCB should check for technical alignment with other activities in and outside of the project as well as clear commit messages that adhere to the [Commit Guidelines](/docs/git/Commit-Guidelines).
\ No newline at end of file
1. CCB regularly reviews open PRs, this includes technical alignment with other activities in and outside of the project.
1. When a PR is ready for a review, it is assigned to a reviewer or reviewers
- this could be a group in an ASAM project or an individual of the CCB for a technical review
- on approval by the reviewers the PR/MR is assigned the ~ReadyForMerge label
1. In their regular review meetings the CCB will perform a final review of this PR and merge accordingly. This final review includes ensuring clear commit messages that adhere to the [Commit Guidelines](/docs/git/Commit-Guidelines).