Continued from Part 1 – Making Changes, we would like to share our notes, NOT guidance, and invite you to give us candid feedback on our proposed walkthroughs that are related to the high-level workflow steps mentioned above:
Now that Doris has made her changes and published them to the repo, she will probably want someone on her team to review those changes. To do this, Doris will need to create a pull request.
From Team Explorer – Home, Doris will click on the Web Portal link. This will open the web browser and take you to your project.
In her web browser, Doris goes to Code > Pull Requests. She then clicks on the New Pull Request link.
Doris now needs to select the Doris\BugFix branch in in the “Review Changes in” and master (default) for the “relative to” branch
Doris will then enter the title, description and assign 1 or more reviews. In this case Dan will be our reviewer. She will then click the Create Pull Request button.
You cannot create or conduct a pull request through Visual Studio IDE. You must go into the Web Portal.
3 View Pull Request
꙱ - Done
Doris has completed the pull request and now Dan (or other teammates) need to review the changes Doris has introduced.
Dan will now login to TFS via the web portal > Open the project > Code > Pull Requests
The left navigation gives shows several options to view the available pull requests.
Viewing and Sorting
In this simple example, Dave only sees one pull request. He can use the navigation to sort by branch, status (active, completed, abandoned), and assignment.
Dan sees the pull request from Doris and clicks on the pull request to view all the details.
From this details screen Dan can participate in a discussion or review the code. The discussion is a history of notes and activities that have taken place during the lifetime of the pull request.
The Code tab displays Dan a list of files that have been changed, the number of commits, and the actual lines of code that have been changed. In this instance we see that 3 new lines have been added to our roster file.
4 Comment and Respond
꙱ - Done
During the process of reviewing the changes, Dan can place comments as general feedback or at the code line level.
Now Dan can provide an approved or rejected response to the changes that Doris has made. Dan can see his approval status and the status of his teammates from the Reviews list.
Pay attention to the Active status.
If the target branch has changed since the pull request was made, you will need to update it before the merge can be completed. Use the re-evaluate button to merge the changes into the top branch.
Once the team has approved the change, Doris is ready to complete the merge.
… to be continued in PART 3 - Reviewing Changes (With Conflicts)