upbound / universal-crossplane

Enterprise-grade @crossplane from @upbound
https://upbound.io/product/universal-crossplane
Apache License 2.0
120 stars 31 forks source link

Simplify process for creating a new release branch #403

Closed turkenh closed 6 months ago

turkenh commented 10 months ago

Description of your changes

The existing process relying on rebase became more challenging with the recent state. With v1.14 release, I had to resolve conflicts for ~15 commits which even includes a revert.

This PR proposes a simplified one without any rebase, leveraging git diff.

I have:

How has this code been tested

See https://github.com/upbound/crossplane/pull/109

phisco commented 9 months ago

would be interesting to see if using rerere would have simplified the rebasing: https://stackoverflow.com/questions/31401754/why-does-the-same-conflict-reappear-when-i-use-git-rebase

turkenh commented 6 months ago

It is strange. I rebased / force pushed and PR is closed saying it is merged and closed 🤔

turkenh commented 6 months ago

Opened https://github.com/upbound/universal-crossplane/pull/427