https://garden.io logo
#💻|dev
The Merge :)
# 💻|dev
b

big-spring-14945

05/19/2023, 10:41 AM
@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.
c

calm-family-29323

05/19/2023, 10:42 AM
sure
c

curved-intern-91221

05/19/2023, 10:42 AM
sounds good
c

calm-family-29323

05/19/2023, 10:42 AM
just make sure gitbook doesn't go wack
c

curved-intern-91221

05/19/2023, 10:48 AM
Can u approve the release PR, please? 🙂 https://github.com/garden-io/garden/pull/4312
b

big-spring-14945

05/19/2023, 11:22 AM
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 🙂
a

ancient-diamond-80011

05/19/2023, 11:37 AM
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
b

big-spring-14945

05/19/2023, 11:53 AM
Yes, assuming that we ported all important changes it should be safe though 👍
c

calm-family-29323

05/19/2023, 11:54 AM
I think this is the best way to go about it
a

ancient-diamond-80011

05/19/2023, 11:55 AM
(it's also really funny how the PR has 150 commits and one file changed 😆 )
c

curved-intern-91221

05/19/2023, 12:04 PM
There is one new commit in 0.13 - let's merge it to the PR branch too
The plan looks good! 👍
At least there are no unexpected changes in the changeset - so the 0.13 won't be polluted by any weird code that we have seen in another experiment
I've updated the https://github.com/garden-io/garden/issues/4271 - feel free to put in more amendments. Let's also sync on the CI config and Docker build steps.
a

ancient-diamond-80011

05/19/2023, 12:11 PM
(edited the description to remove the mentions of conflicts and doing a branch swap at the end, as those are no longer an issue)
c

curved-intern-91221

05/19/2023, 12:43 PM
I'm going to merge main into the PR branch, just to get the recent few changes from main.
Can we quickly pair on it?
@ancient-diamond-80011 @big-spring-14945 @calm-family-29323 can we quickly sync on the https://github.com/garden-io/garden/issues/4271 ?
@big-spring-14945 can you update the PR branch with the latest changes from main, please?
b

big-spring-14945

05/19/2023, 1:32 PM
I need to run to a train, will be online at ~16:40 again.
c

curved-intern-91221

05/19/2023, 1:33 PM
How is it going with dockerhub CI steps? (feel free to reply later:) )
b

big-spring-14945

05/19/2023, 1:39 PM
Already merged 👍
The PR has been updated now 👍 Because of the checkout step, it is important to make sure that the merge is happening in a branch that is up to date with 0.13
@curved-intern-91221 @ancient-diamond-80011 @calm-family-29323 I would propose that we merge this now asap, can you review https://github.com/garden-io/garden/pull/4314 ?
Awesome, it worked. This was definitely the craziest PR I merged on a Friday night 🙂
I just tested if merging 0.13 to main is now fast forward, and it is actually 🙂
Copy code
steffen@MacBook-Pro garden % git merge 0.13
Updating 2bb2a3297..1d85571f6
Fast-forward
f

freezing-pharmacist-34446

05/19/2023, 2:54 PM
Awesome job everyone!
b

big-spring-14945

05/19/2023, 3:32 PM
🤗 Thanks