@calm-family-29323 @curved-intern-91221 pairing with veeti today, we had the idea to first merge main into 0.13 now-ish, instead of 0.13 into main on release day – there would be two advantages to this approach: 1. We can do it now, and see if our plan will work. On release day, it will be a fast forward merge to main without conflicts. 2. In the meantime we can verify that the merge did not introduce any regressions.

sure

sounds good

just make sure gitbook doesn't go wack

Can u approve the release PR, please? 🙂 https://github.com/garden-io/garden/pull/4312

We tried the merge with --merge-strategy ours, but there were a lot of weird changes as sometimes there was no conflict but the code ended up in a bad state. We had another idea: 1. start the merge (

git checkout 0.13; git pull; git merge origin/main

) 2. resolve all conflicts, by checking out all files to origin/0.13 (

git checkout origin/0.13 -- .

) 3.

git commit

Assuming that we really ported all the important changes from 0.12 to 0.13 already, that should be enough to complete the merge, and it would also be safe as we have a guarantee that there are no unexpected changes creeping in from 0.12. Result of this experiment is here: https://github.com/garden-io/garden/pull/4314 It should enable us to fast-forward merge 0.13 to main because of our creative "conflict resolution" once we merged this PR 🙂

this is of course slightly scary because we are essentially solving the conflicts by discarding all changes from

main

on the other hand, as Steffen just said in a DM (when discussing another cherrypick PR): > But the really good thing is, I think, even if we end up noticing at some point that we forgot something, we can still port it later

Yes, assuming that we ported all important changes it should be safe though 👍

I think this is the best way to go about it

(it's also really funny how the PR has 150 commits and one file changed 😆 )

There is one new commit in 0.13 - let's merge it to the PR branch too

(edited the description to remove the mentions of conflicts and doing a branch swap at the end, as those are no longer an issue)

I'm going to merge main into the PR branch, just to get the recent few changes from main.

I need to run to a train, will be online at ~16:40 again.

How is it going with dockerhub CI steps? (feel free to reply later:) )

Already merged 👍

Awesome job everyone!

🤗 Thanks