JeremyYao commented on code in PR #1575: URL: https://github.com/apache/daffodil-vscode/pull/1575#discussion_r2688483822
########## DEVELOPMENT.md: ########## @@ -210,6 +217,54 @@ Once changes are pushed, you can make pull requests with completed changes back  +### Pull Request Approval and Merge Process + +Once you've created a pull request to the main daffodil-vscode branch, it must go through the Apache Daffodil project's approval process before it can be merged. + +#### Approval Requirements + +**All pull requests require at least two +1 votes (green approvals) from PMC members or committers before they can be merged.** This ensures that changes are properly reviewed and meet the project's quality standards. The approvals must come from committers with write access to the repository. + +#### Review Cycle + +The review process typically follows this workflow: + +1. **Submit Pull Request**: Create your PR with your proposed changes to the main branch +2. **Reviewer Feedback**: PMC members, committers, and other contributors will review your code and provide feedback +3. **Address Feedback**: Add new commits to address review comments + - **Important**: Do not squash previously reviewed commits during the review cycle + - Each review iteration should involve a separate, distinct commit to preserve the review commentary + - The pull request will automatically update with new commits pushed to your branch +4. **Approval**: Once reviewers are satisfied, they will provide +1 votes (approvals) +5. **Merge**: After receiving at least two +1 votes from PMC members or committers, your PR is ready to be merged. **Squash all of your commits on your branch into one commit** before the final merge, as our PR pipeline has a check that only allows for PRs with a single commit + +#### Merging Process + +Only committers with merged GitHub and ASF (Apache Software Foundation) accounts have the authority to merge pull requests. + +**Merge Method**: When merging, committers must: +- Click the "Merge pull request" dropdown +- Select **"Rebase and merge"** +- Do **not** use "Squash and merge" or "Create a merge commit" + +This maintains a clean, linear commit history while preserving individual commits from the pull request. + +#### Post-Merge Actions + +After a pull request is merged, the committer who performed the merge should: +1. Mark the associated GitHub issue as "Closed" or move it to the appropriate project board status Review Comment: Looks good! Resolving this. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
