Skip to content

Pre-merge branch for batch of changes#1913

Merged
scarlehoff merged 34 commits into
develop_merge_20240119from
develop_20240119
Jan 19, 2024
Merged

Pre-merge branch for batch of changes#1913
scarlehoff merged 34 commits into
develop_merge_20240119from
develop_20240119

Conversation

@scarlehoff
Copy link
Copy Markdown
Member

@scarlehoff scarlehoff commented Jan 19, 2024

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.

@scarlehoff
Copy link
Copy Markdown
Member Author

@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:

#1881
then
#1888

Is the order correct? Or should I only merge one of them because it contains the other?

@scarlehoff scarlehoff added the run-fit-bot Starts fit bot from a PR. label Jan 19, 2024
@APJansen
Copy link
Copy Markdown
Collaborator

#1888 branches directly off master and has been reviewed, so it can be merged here.
#1881 branches off of #1888, and I think still needs to be reviewed.

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

@scarlehoff
Copy link
Copy Markdown
Member Author

Ok! Perfect.

I now need to understand how to tell github actions that this is not, in fact, master...

@scarlehoff scarlehoff changed the base branch from master to develop_merge_20240119 January 19, 2024 12:57
@scarlehoff scarlehoff merged commit 039c38a into develop_merge_20240119 Jan 19, 2024
@scarlehoff scarlehoff deleted the develop_20240119 branch January 19, 2024 13:39
@github-actions
Copy link
Copy Markdown

Greetings from your nice fit 🤖 !
I have good news for you, I just finished my tasks:

Check the report carefully, and please buy me a ☕ , or better, a GPU 😉!

@scarlehoff scarlehoff mentioned this pull request Jan 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

destroyingc++ run-fit-bot Starts fit bot from a PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants