Maintenance operation of our GitLab server is scheduled for Thursday, February 29th at 2PM. The server will be unavailable for about 2 hours.
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 -Xdiff-algorithm=histogram src_branch command
There were merge conflicts but they were quite trivial.
Compared to MR 399, I made one different choice on a merge