batch-example

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.

change process

FTBatch development pc on development branch

git branch -D format-branch
git checkout -b format-branch

make changes and export files

commit and push back to server

git add -A
git commit
git push origin format-branch

format-bot pc

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

git add -A
git commit
git push origin product-development