chore(ci): tweak merge script to have less conflicts and output to be more readable #10452
+20
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dandarnell
changed the title
coreycb
requested changes
Jan 30, 2026
wmontwe
changed the title
dandarnell
force-pushed
the
merge-tweaks
branch
from
131a1b4 to
a743a93
Compare
dandarnell
force-pushed
the
merge-tweaks
branch
from
a743a93 to
11fbb3d
Compare
coreycb
reviewed
Feb 9, 2026
| scripts/ci/templates/changelog_master.xml merge=merge_changelog | ||
|
|
||
| app-metadata/com.fsck.k9/*/changelogs/** merge=merge_changelog | ||
| app-metadata/net.thunderbird.android.beta/*/changelogs/** merge=merge_changelog No newline at end of file |
Collaborator
There was a problem hiding this comment.
You'll want to add this one too:
app-metadata/net.thunderbird.android/*/changelogs/** merge=merge_changelog
| app-thunderbird/build.gradle.kts merge=merge_gradle | ||
| app-k9mail/src/main/res/raw/changelog_master.xml merge=ours | ||
|
|
||
| app-k9mail/src/main/res/raw/changelog_master.xml merge=merge_changelog |
Collaborator
There was a problem hiding this comment.
I think we'll want to add this one too:
./app-thunderbird/src/release/res/raw/changelog_master.xml
It only exists in the release branch but to be safe we don't want to overwrite it.
| app-k9mail/src/main/res/raw/changelog_master.xml merge=merge_changelog | ||
| app-thunderbird/src/debug/res/raw/changelog_master.xml merge=merge_changelog | ||
| app-thunderbird/src/daily/res/raw/changelog_master.xml merge=merge_changelog | ||
| scripts/ci/templates/changelog_master.xml merge=merge_changelog |
Collaborator
There was a problem hiding this comment.
These 3 can can be removed. It should be fine to overwrite what's in beta/release with what is in main:
app-thunderbird/src/debug/res/raw/changelog_master.xml merge=merge_changelog
app-thunderbird/src/daily/res/raw/changelog_master.xml merge=merge_changelog
scripts/ci/templates/changelog_master.xml merge=merge_changelog
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch does two things:
Tells git to default to a "theirs" strategy when there are merge conflicts (i.e. in a main -> beta merge conflict, take the file from main).
Highlight "CONFLICT" in red, so it can be easily spotted in
git mergeoutput.