Astyle integration test2
This is a test on how to astyle and merge to validate the process.
I've integrated 4 pending MRs:
- First I've astyled in each branch with the CI astyle option files the files that are been modified by the MR
- Then I merge into the integration using
git merge -s recursive -Xpatience src_branchcommand
There were merge conflicts but they were quite trivial