... | ... | @@ -21,3 +21,22 @@ Usually contributors are not allowed to merge directly into a main branch. |
|
|
|
|
|
* Git repository hosts such as GitHub and Bitbucket choose the name **pull request** since the first manual action would be to pull the feature (source) branch.
|
|
|
* Git repository hosts such as GitLab and Gitorious choose the name **merge request** since that is the final action requested.
|
|
|
|
|
|
# 1. Creation of a Merge-Request #
|
|
|
|
|
|
When creating, the developer **SHALL** provide the following information:
|
|
|
|
|
|
* Short Title
|
|
|
* Link to the Ticket/Issue ID
|
|
|
* Add the proper labels:
|
|
|
- Kind such as (<img src="../images/enhancement-label.png" /> or <img src="../images/bug-label.png" />)
|
|
|
- Functional
|
|
|
|
|
|
# 2. Merge-Request and Continuous Integration #
|
|
|
|
|
|
Opening a Merge-Request should automatically trigger a job.
|
|
|
Continuous Integration could de-centralized over several servers belonging to OSA members.
|
|
|
|
|
|
The OAI Continuous Integration workflow is described in the following picture:
|
|
|
|
|
|
<img src="../images/CI-workflow.png" /> |