Skip to content

Clarify "Merge correctly" rule #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Shiroizu merged 1 commit into from
Jan 31, 2026
Merged

Clarify "Merge correctly" rule #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/content/rules/merge-correctly.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ rationale:
status: Active
rule_context:
mikumod_support: "Planned"
excerpt: Merge lower-status entries into higher-status ones, or newer entries into older ones.
---

Merge from lower entry status to higher entry status, or from newer to older entry.
Entries should be merged following this priority.

1. Merge the **lower-status** entry into the **higher-status** one. For example, merge the "Draft" entry into the "Finished" entry.
2. If the entries has the same status, merge the **newer** entry into the **older** one. For example, merge the entry with ID 1001 into the entry with ID 1000.