From a4d284a679bb95aacd57961e9d72dec2c78991e2 Mon Sep 17 00:00:00 2001 From: MikeHillberg <18429489+MikeHillberg@users.noreply.github.com> Date: Tue, 19 Mar 2019 17:39:59 -0700 Subject: [PATCH 1/2] Use two branches for the two phases of PR --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 30d561f25..32c0f2940 100644 --- a/README.md +++ b/README.md @@ -33,18 +33,20 @@ For WinUI team members, the workflow to author specs is: 1. Ensure your proposal is approved and in plan. -2. Create a new working branch: ```/user//``` +2. Create two working branches: ```user//``` and ```user//_review``` +(Do your work in the first branch, save the `review` branch for later.) 3. Create a new folder for your spec under the ```active``` folder: ```/active/``` 4. Author your spec using the [spec template](/spec_template.md). Please use relative links for images or other assets in the folder. -5. When your spec is ready for review: - * Open a new pull request to merge your spec to the ```master``` branch +5. When your spec is ready for the team, area experts, and feature customers to review: + * Open a new pull request to merge your spec to the ```user//_review``` branch * Update your proposal issue with a link to the spec PR -6. Review spec in checkpoint meetings to close open issues. +6. When your spec is complete and merged, and ready for API review, +open a PR to the ```master``` branch 7. When your spec is complete and signed off, merge the PR. From 0e6d9ec996edc9289423dd2715b818afe9aad94d Mon Sep 17 00:00:00 2001 From: MikeHillberg <18429489+MikeHillberg@users.noreply.github.com> Date: Tue, 19 Mar 2019 17:46:56 -0700 Subject: [PATCH 2/2] Add some explanation. --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 32c0f2940..e6633ad49 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,11 @@ For WinUI team members, the workflow to author specs is: 1. Ensure your proposal is approved and in plan. -2. Create two working branches: ```user//``` and ```user//_review``` -(Do your work in the first branch, save the `review` branch for later.) +2. Create two working branches: ```user//``` and ```user//_review```. +Do your work in the first branch, save the `review` branch for later. + + (Two branches allows us to do a two step PR: one a spec review within the team, local experts, and customers of the feature; + and one as a broader API review.) 3. Create a new folder for your spec under the ```active``` folder: ```/active/```