Closed SoumyaRanjanPatnaik closed 1 year ago
The history has gotten really messy. I originally branched from 'main' (which targets focal and impish) but it was only later that I realized that the 'jammy' branch was the is under active development. I had to go though a lot of effort to ensure only the relevant changes were kept.
I would prefer if the branch could somehow be cleaned, but I'm not sure if that's possible. Otherwise we can squash and merge to produce a single commit if you're okay with the changes.
Based on your comment above, both main
and ubuntu/jammy
are active development branches. There was a big version bump when going to Jammy which makes the dependencies quite a bit different. Any change that I am making in main
I'm also making in ubuntu/jammy
.
Is there an advantage to merging this before the 2.2 release (which I'd like to get a beta out this weekend if possible)
Based on your comment above, both
main
andubuntu/jammy
are active development branches. There was a big version bump when going to Jammy which makes the dependencies quite a bit different. Any change that I am making inmain
I'm also making inubuntu/jammy
.Is there an advantage to merging this before the 2.2 release (which I'd like to get a beta out this weekend if possible)
Ohh. I thought the main wasn't maintained, so I merged ubuntu/jammy, which is what led to this mess. And no, there's no benefit of merging this early as such. But in the meantime, if you need me to make any more changes, I'll be happy to. Also, if there's anything else that you need help with, I'll be happy to volunteer in my free time.
What works:
What doesn't work: