Closed swissclash79 closed 5 months ago
Hmm the error is coming from a wrong check-in from my side into development branch this morning. But why is it now also coming within this branch? I'm not sure any more what will happen when we merge this, it seems the changes on development branch are also in this pull request.
Shall we go back to "development" branch? I will fix the broken build now.
Or easiest way would be, I can just cherry-pick this four commits of yours into dev-1.6 branch... will try that.
Actually this is what I did...
Hmm weird, when I make a diff with "dev-1.6" and your pull request branch, I see also all changes from "development" branch. I'm not sure if a merge will only take the four commits.
I do it by hand with cherry-pick into local "dev-1.6" and let the pull request as it is, if you don't mind?
Sorry for the inconvenience...
No problem, my fault. I picked changes into dev-1.6 branch now and pulled. You can cross-check the changes in dev-1.6 and as soon as I get the OK from you, I merge it also to "development" and make the patch release.
I retested everything once more. Looks good to me. 👍
Perfect, thanks, then I close this pull-request now. Patch release will follow tomorrow.
@anhefti I successfully moved my changes to a new branch
integrate-seb-server-in-olat
checked out fromdev-1.6
but unfortunately the build is broken now:Locally, the build is still working and all tests succeed.