@@ -75,13 +75,43 @@ main — stable, releases only
7575
7676## Upstream Integration Rules (MANDATORY)
7777
78- Before cherry-picking ANY change from ` mkaring/ConfuserEx ` :
78+ Before cherry-picking or adapting ANY change from ` mkaring/ConfuserEx ` :
7979
80- 1 . ** Verify the issue/PR is still open and relevant**
81- 2 . ** Only work on OPEN issues and PRs**
82- 3 . ** Review the actual diff** — do NOT blindly cherry-pick
83- 4 . ** Analyse code quality** — check for regressions and edge cases
84- 5 . ** Close issues already implemented** in our fork
80+ ### 1. Verify status first
81+
82+ - Check ` gh issue view <number> --repo mkaring/ConfuserEx ` for current status
83+ - Check if a fix was already merged upstream after the issue was filed
84+ - If the issue is closed/fixed upstream, verify our fork already has the fix
85+ - Close our corresponding issue if already resolved
86+ - ** Only work on OPEN issues and PRs** — skip closed, wontfix, duplicate, invalid
87+
88+ ### 2. Review the actual code
89+
90+ - Fetch the PR: ` git fetch mkaring pull/<number>/head:pr-<number> `
91+ - Read the actual diff, not just the title
92+ - Check if the change conflicts with our existing modifications
93+ - Test that the cherry-pick applies cleanly
94+ - ** Do NOT blindly cherry-pick — understand what the code does first**
95+
96+ ### 3. Analyse code quality
97+
98+ - Review for correctness, not just intent
99+ - Check for regressions, missing edge cases, or poor patterns
100+ - Verify the fix actually solves the stated problem
101+ - Check if there's a better approach than the upstream PR
102+
103+ ### 4. When creating issues from upstream
104+
105+ - Create matching issues on both private and public repos
106+ - Reference the upstream issue number in the description
107+ - Mention the original reporter when posting fixes
108+ - Tag with appropriate labels (enhancement, bug, upstream)
109+
110+ ### 5. PR iteration rules
111+
112+ - Always push fixes to the ** same branch** — never create replacement PRs
113+ - When a PR gets review feedback, push additional commits to the same branch
114+ - When a tester reports issues, fix on the same branch and ask for re-test
85115
86116---
87117
0 commit comments