added new phase to unit 2

This commit is contained in:
giles 2023-10-17 18:26:08 +01:00
parent 841082d216
commit 17152d8e9b
3 changed files with 1327 additions and 2 deletions

View File

@ -4,3 +4,46 @@ This repository will store and allow versioning and approval of a batch configur
This repository **only** contains exported configuration. It does not contain any binary files (eg equipment-model.cfg nor system state or log files). These are excluded using the **.gitignore** file. This repository **only** contains exported configuration. It does not contain any binary files (eg equipment-model.cfg nor system state or log files). These are excluded using the **.gitignore** file.
## change process
### FTBatch development pc on development branch
```sh
git branch -D format-branch
git checkout -b format-branch
```
make changes and export files
commit and push back to server
```sh
git add -A
git commit
git push origin format-branch
```
### format-bot pc
```sh
git branch -D format-branch
git fetch origin
git checkout -b format-branch
git checkout master
git pull
git branch -D product-development
git checkout -b product-development
git merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
```
run the formatter
```sh
git add -A
git commit
git push origin product-development
```

1284
equipment-model.a.yml Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long