chore(ci): tweak merge script to have less conflicts and output to be more readable#10452
chore(ci): tweak merge script to have less conflicts and output to be more readable#10452dandarnell wants to merge 1 commit intothunderbird:mainfrom
Conversation
dandarnell
changed the title
wmontwe
changed the title
dandarnell
force-pushed
the
merge-tweaks
branch
2 times, most recently
from
a743a93 to
11fbb3d
Compare
.gitattributes
Outdated
| 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 |
There was a problem hiding this comment.
You'll want to add this one too:
app-metadata/net.thunderbird.android/*/changelogs/** merge=merge_changelog
.gitattributes
Outdated
| 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 |
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
dandarnell
force-pushed
the
merge-tweaks
branch
from
11fbb3d to
8fd5421
Compare
|
|
||
| app-metadata/com.fsck.k9/*/changelogs/** merge=merge_changelog | ||
| app-metadata/net.thunderbird.android.beta/*/changelogs/** merge=merge_changelog | ||
| app-metadata/net.thunderbird.android/*/changelogs/** merge=merge_changelog No newline at end of file |
There was a problem hiding this comment.
Again, sorry I missed this. We don't want to merge anything in the above 3 changelogs directories. These directories contain release notes for releases from the current branch. (They are supposed to, at least, but that's probably not the case anymore due to previous merges.) The file names are based on the versionCode, and there's potential that the versionCode could overlap between beta and release.
So what we really want to do here is exclude any changes to these directories in the merge. Or at least use merge=ours.
| app-k9mail/src/main/res/raw/changelog_master.xml merge=ours | ||
|
|
||
| app-k9mail/src/main/res/raw/changelog_master.xml merge=merge_changelog | ||
| app-thunderbird/src/release/res/raw/changelog_master.xml |
There was a problem hiding this comment.
I'm sorry, I missed something here and I think I sent you down the wrong path. For the following 3 files, we want to keep ours in all cases.
app-thunderbird/src/release/res/raw/changelog_master.xml merge=ours
app-thunderbird/src/beta/res/raw/changelog_master.xml merge=ours
app-k9mail/src/main/res/raw/changelog_master.xml merge=ours
4 participants
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.