big-spring-14945
05/19/2023, 10:41 AMcalm-family-29323
05/19/2023, 10:42 AMcurved-intern-91221
05/19/2023, 10:42 AMcalm-family-29323
05/19/2023, 10:42 AMcurved-intern-91221
05/19/2023, 10:48 AMbig-spring-14945
05/19/2023, 11:22 AMgit 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 🙂ancient-diamond-80011
05/19/2023, 11:37 AMmain
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 laterbig-spring-14945
05/19/2023, 11:53 AMcalm-family-29323
05/19/2023, 11:54 AMancient-diamond-80011
05/19/2023, 11:55 AMcurved-intern-91221
05/19/2023, 12:04 PMancient-diamond-80011
05/19/2023, 12:11 PMcurved-intern-91221
05/19/2023, 12:43 PMbig-spring-14945
05/19/2023, 1:32 PMcurved-intern-91221
05/19/2023, 1:33 PMbig-spring-14945
05/19/2023, 1:39 PMsteffen@MacBook-Pro garden % git merge 0.13
Updating 2bb2a3297..1d85571f6
Fast-forward
freezing-pharmacist-34446
05/19/2023, 2:54 PMbig-spring-14945
05/19/2023, 3:32 PM