Pre-merge branch for batch of changes#1913
Conversation
|
@APJansen I'm going to run the bot on my batch of branches and then I will merge yours and do the same. I'll try to rebase them (they should be 100% independent and try to fix any small conflicts myself) I will do: Is the order correct? Or should I only merge one of them because it contains the other? |
|
#1888 branches directly off master and has been reviewed, so it can be merged here. So perhaps you can merge #1888, I'll rebase #1881 on this branch and then it can be reviewed before merging here? #1905 branches off of #1888, so this should wait for that. The destroyingc++ label along with the very large diff looks great btw ;P |
|
Ok! Perfect. I now need to understand how to tell github actions that this is not, in fact, master... |
48e8535 to
f51fba6
Compare
Co-authored-by: Roy Stegeman <roystegeman@live.nl>
Co-authored-by: Roy Stegeman <roystegeman@live.nl>
Co-authored-by: Roy Stegeman <roystegeman@live.nl>
Co-authored-by: Roy Stegeman <roystegeman@live.nl>
Co-authored-by: Roy Stegeman <roystegeman@live.nl>
f51fba6 to
be2535e
Compare
|
Greetings from your nice fit 🤖 !
Check the report carefully, and please buy me a ☕ , or better, a GPU 😉! |
Dummy branch to merge the latest changes to a single branch and run tests before merging to master.
Incidentally, I just found a bug either on the way github calls the workflow or the way in which we configured it.