Merge 19.2 code freeze with conflicts resolution - #17900
Conversation
Conflicts on `Podfile` and `Podfile.lock` because the WordPressKit beta version changed in the time it took me to open the PR at #17899 😳
mokagio
left a comment
mokagio
left a comment
There was a problem hiding this comment.
- Switch to production Pods
- New version header in
RELEASE-NOTE.txt -
Localizable.stringsupdated -
release_notes.txtupdated with notes fromRELEASE-NOTE.txtfor current version - Version update in
.xcconfiganddownload_metadata.swift
| * [**] Notifications: added a button to mark all notifications in the selected filter as read. [#17840] | ||
| * [**] People: you can now manage Email Followers on the People section! [#17854] | ||
| * [*] Stats: fix navigation between Stats tab. [#17856] | ||
| * [**] Threaded comments: comments can now be moderated via a drop-down menu on each comment. [#17888] |
There was a problem hiding this comment.
👋 @leandroalonso !
Can you please make sure that Threaded comments are applicable to Jetpack as well? 🙏
PS: I think it does, just wanted to double check with you.
|
At the time of writing this, the Installable Builds tasks have not yet run.
Looking at the pipeline that run on Buildkite, the steps weren't even added to it. The reason, I'm pretty sure, is that when Buildkite run, I hadn't open this PR yet. You can see that the environment for the build shows no pull request:
I'm now going to restart the build to see if Buildkite picks up that there now is a PR associated with the commit 🤞
|
The answer is no 😞 Direct link to the build: https://buildkite.com/automattic/wordpress-ios/builds/4991#558b0e4c-9367-4943-98de-b0825cf0bf22 |
|
Unfortunately, the PR (#17900 (comment)), couldn't be merged yesterday, so new conflicts arose. There was one one `Podfile.lock` in the checksum field. I solved by re-running `bundle exec pod install` after the merge to generate an up-to-date value. Git auto-resolved a conflict on the `RELEASE-NOTES.txt` file in an incorrect way: it kept both new line after the 19.3 header and the first entry for that version. I overwrote it by removing the new line.
4 participants
Supersedes #17899. I got conflicts on
PodfileandPodfile.lockbecause the WordPressKit beta version changed in the time it took me to open the original PR. WordPress iOS moves fast 😄