Merge Integration Strategy

GitGuru2003 commented 2 hours ago

References User Story #1: Workflow Integrating Strategies

:bulb: HINT: Feel free to click the checkboxes below (which serve as a TODO checklist for the task) as you progress through the instructions.

TODO:

[x] :question: Answer question Task2_Q1 on Canvas
[x] :bust_in_silhouette: Assign yourself to this task (this will prompt the WorkflowLearning GitHub App to create the task_2_merge branch)
[x] :hourglass_flowing_sand: Wait (at most) 60 seconds until the WorkflowLearning GitHub App will comment on this task and confirm that the branch task_2_merge was created (refresh the page if you don't see the confirmation comment)
[x] Create a new PR having the base branch master and the compare branch task_2_merge
[x] Edit the description of the PR to reference this task (i.e., the PR description should contain Closes #2)
[x] :brain: Understand the commits and file changes made in the PR
[x] :question: Answer question Task2_Q2 on Canvas
[x] :arrows_counterclockwise: Refresh this page (to ensure that any commits referencing this task are shown on this page) and scroll all the way to the bottom of the page
[x] :question: Answer question Task2_Q3 on Canvas

Starting integration...

[x] In the PR, integrate the changes into master
- using the Merge pull request option
- with the commit message Merge pull request #<ID_PR> from <yourGitHubUserName>/task_2_merge (i.e., the default commit message provided by GitHub)

Integration completed.

[x] :eyes: Inspect the history of all the branches and commits in your repository via the GitHub visualization provided in the GitHub tab Insights -> Network
[x] :x: In the PR, use the GitHub interface to delete the branch (since the branch content was successfully integrated into master)
[x] :eyes: Inspect the history of all the branches and commits via Insights -> Network
NOTE: even though the branch was deleted, the branch trace is still present, cluttering the repository history
[x] :arrows_counterclockwise: Refresh this page (to ensure that any commits referencing this task are shown on this page) and scroll all the way to the bottom of the page
[x] :question: Answer question Task2_Q4 on Canvas
[x] :question: Answer question Task2_Q5 on Canvas

workflowlearning[bot] commented 1 hour ago

:runner: Creating branch `task_2_merge`...

:hourglass_flowing_sand: Please wait (at most) 60 seconds until the WorkflowLearning GitHub App will add a new comment to this task and confirm that the branch task_2_merge was created successfully (refresh the page if you don't see the confirmation comment).

Additional details

Detected event = `assigned` Branch to be created (containing a few commits) = `task_2_merge` Repository full name = `GitGuru2003/CS471WorkflowsHomeworkAssignment` Issue number = `#2` Issue title = 'Merge Integration Strategy' Assignee login = 'GitGuru2003' ---

FAQ

**Q: What type of events trigger the [WorkflowLearning GitHub App](https://github.com/apps/workflowlearning) to create a new branch containing a series of commits?** - a developer is assigned to issues `#2`, `#3`, `#4`, `#5` and `#6` in a repository called `CS471WorkflowsHomeworkAssignment`

Beta Disclaimer

[WorkflowLearning GitHub App](https://github.com/apps/workflowlearning) `v1.0.2` (see [Semantic Versioning](https://semver.org/)) is an experimental [GitHub Application](https://developer.github.com/apps/) that attempts to provide a "sandbox" environment for learning about different **workflow integrations**, such as merge, rebase and squash. This bot is still in **BETA**, and if you think the feedback provided is inaccurate please submit a bug report (i.e., email the instructor) and you can get extra credit.

#### Debug Information ``` github_event = issues payload_action = assigned request_number = 532 ```

workflowlearning[bot] commented 1 hour ago

:thumbsup: Branch `task_2_merge` was created successfully

Please continue with the next steps as specified in the task description.

Additional details

---

FAQ

**Q: What type of events trigger the [WorkflowLearning GitHub App](https://github.com/apps/workflowlearning) to create a new branch containing a series of commits?** - a developer is assigned to issues `#2`, `#3`, `#4`, `#5` and `#6` in a repository called `CS471WorkflowsHomeworkAssignment`

Beta Disclaimer

[WorkflowLearning GitHub App](https://github.com/apps/workflowlearning) `v1.0.2` (see [Semantic Versioning](https://semver.org/)) is an experimental [GitHub Application](https://developer.github.com/apps/) that attempts to provide a "sandbox" environment for learning about different **workflow integrations**, such as merge, rebase and squash. This bot is still in **BETA**, and if you think the feedback provided is inaccurate please submit a bug report (i.e., email the instructor) and you can get extra credit.

#### Debug Information ``` github_event = issues payload_action = assigned request_number = 532 ```

GitGuru2003 / CS471WorkflowsHomeworkAssignment