search

thunderbird / thunderbird-android

K-9 Mail – Open Source Email App for Android
https://k9mail.app/
Apache License 2.0
9.47k stars 2.42k forks source link

Merge `6.8-MAINT` into `main` #7784

Closed cketti closed 2 weeks ago

cketti commented 2 weeks ago

1/3: So far only patches have been applied to 6.8-MAINT that can/should also be merged into main. #7765 is the first change that should not be applied to main. However, it hasn't been merged yet, and so it won't become part of main by merging this PR.

The only additional changes that this PR will merge into main are:

2: The idea of the task: backport label is to tag changes that should be tested in a beta version before backporting them to the maintenance branch (see also label description). The changes currently using this label haven't been included in a beta yet. That's why the changes haven't been backported yet.

wmontwe commented 2 weeks ago

That are all valid reasons, but in it's essence it will establish a pattern on how to do maintence patches and as there is no other information in the project, it will be the pattern to use.

To ensure consistency and clarity for future contributions to the project, it is important that our current approach is documented. Setting clear expectations and quidance to reduce confusion and errors that might require rework that could be avoided.

The documentation does not have to be comprehensive or error-free and there are plenty of examples out there already.

cketti commented 2 weeks ago

Deferring this until we have documentation on how to do maintenance releases.