Today's English Expression 29/30 · Stage: Post-merge. All example sentences were created specifically for this post. They are not taken from actual repository comments, and the versions and numbers are examples.
Table of Contents
- At a Glance
- 1. Meaning and Nuance
- 2. Examples
- 3. Similar Expressions and Differences
- 4. Common Mistakes Made by Koreans
- 5. One-Line Practice
- Sample Answer
- References
At a Glance
| Expression | This landed in main. / The fix will ship in v1.5.0. |
| Meaning | It has been merged into main / This fix will ship in v1.5.0. |
| Context | Issue closing comments, release notes, Slack |
| Politeness | Neutral. Used to state status. |
1. Meaning and Nuance
The word "land" means "to touch down." In development, this has evolved to mean thata change has passed review and entered the main branch of the repository. The Chromium contribution documentation also says that commit messages are used when changes are "landed in the Chromium tree," and uses phrases like "before a parent change lands in main." Both the intransitive form ("This landed") and the transitive form ("I landed the change") are used. The most frequently asked question after a merge is, "So when can I use it?" At this time, you must
distinguish between merging and releasing distinguish between merging and releasingwhen speaking.
- landed / merged: Has entered the main branch. It may not have been released yet.
- released / shipped: Included in a release and available to users.
- will be in / will ship in (version): Scheduled to be included in the next release.
Mixing these up causes misunderstandings. If a user hears that it has been "fixed," upgrades to the current version, and still encounters the bug, the issue gets reopened and leads to unnecessary conversation. Therefore, when closing an issue, you should clearly state which branch it went into and which version it will ship inis also helpful to include. Whether it needs to be separately moved to a release branch is covered in part 30 on backporting.
2. Examples
Scenario 1: Closing an issue
The fix landed in main via #4210 and will be included in v1.5.0. Closing this, but feel free to reopen if you still see the problem after upgrading.
"via" means "through." "Feel free to reopen" grants permission to reopen, softening the closing remark.
Scenario 2: Answering a user's question
It's merged but not released yet. If you need it now, you can try the nightly build; otherwise it'll ship in the next minor release.
A nightly build is a test build created from main every night. The name varies depending on the project.
Scenario 3: Sharing good news on Slack
My first PR to the project just landed! Thanks to everyone who reviewed it.
3. Similar Expressions and Differences
- Merged. The most direct and unambiguous. It matches the status name on the GitHub interface.
- Shipped in v1.5.0. Means it has already been included in a release. Users can use it starting from that version.
- Available in v1.5.0 and later. Meaning "available in v1.5.0 and later," this is the precise expression used in documentation or release notes.
4. Common Mistakes Made by Koreans
- It is reflected. Translating "reflected" literally makes it unclear what and how it was reflected (similar to the mistake with "reflect" in part 17).
- Corrected sentence: The fix has been merged into main.
- It is fixed. Please update. If it hasn't been released yet, the user has no version to update to.
- Corrected sentence: It's fixed in main and will be in v1.5.0.
- This was merged in v1.5.0. Merging happens into a branch, while a version is the name of a release. When used with a version, "included" or "shipped" is accurate.
- Corrected sentence: This is included in v1.5.0. or This shipped in v1.5.0.
5. One-Line Practice
Rewrite the following Korean sentence as a comment for closing an issue.
This fix has been merged into main and will be included in the next patch release. Please check again then.
Sample Answer
This fix landed in main and will be part of the next patch release. Please give it a try once it's out.
"be part of" is a natural translation for "included in." "once it's out" means "when it comes out," which is great to use when the exact release time is unknown.
Titi's Word. "Got in" and "went out" are different. Distinguishing between the two prevents you from receiving the same question twice.
References
- Chromium, Contributing to Chromium (Committing): https://chromium.googlesource.com/chromium/src/+/main/docs/contributing.md
- Merriam-Webster, "ship": https://www.merriam-webster.com/dictionary/ship