batch-example/README.md

50 lines
945 B
Markdown
Raw Normal View History

2023-10-17 09:14:54 +00:00
# batch-example
2023-10-17 09:31:49 +00:00
This repository will store and allow versioning and approval of a batch configuration.
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.
2023-10-17 09:14:54 +00:00
2023-10-17 17:26:08 +00:00
## 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
```