@@ -9,20 +9,20 @@ InEEd-DC Model Library - **!! SHORT DESCRIPTION TO BE DONE !!**
...
@@ -9,20 +9,20 @@ InEEd-DC Model Library - **!! SHORT DESCRIPTION TO BE DONE !!**
If you want to contribute to the InEEd-DC Model Library, please follow the rules and guidelines specified below:
If you want to contribute to the InEEd-DC Model Library, please follow the rules and guidelines specified below:
### Branches
### Branches
- All developing works should be done in personal branchs or feature branches. Please follow the name guidelines for creating new branches: `dev_<NameAbbr>` or `dev_<feature>`.
- All developing works should be done in personal branchs or feature branches. Please follow the name guidelines for creating new branches: `dev_<NameAbbr>` or `dev_<feature>`.
- Merge requests to the `master` branch should be coordinated with other developers in advance.
- Merge requests to the `main` branch should be coordinated with other developers in advance.
- The master branch will be updated at least every two weeks.
- The main branch will be updated at least every two weeks.
### Mergen into master branch
### Merge into main branch
For the update process (mergen) of master branch, the following instruction in 7 Steps has been presented and should be followed:
For the update process (mergen) of main branch, the following instruction in 7 Steps has been presented and should be followed:
| Step | discription |
| Step | discription |
| ------ | ------ |
| ------ | ------ |
| Step 1 | pull master branch (remote) |
| Step 1 | pull main branch (remote) |
| Step 2 | merge master branch (local) in MyFeature branch (local) and solve merge-conflicts in MyFeature branch |
| Step 2 | merge main branch (local) in MyFeature branch (local) and solve merge-conflicts in MyFeature branch |
| Step 3 | test the MyFeature branch (local) by its functionality |
| Step 3 | test the MyFeature branch (local) by its functionality |