Skip to content

Commit

Permalink
Updated readme,md by fixing a typo (microsoft#312)
Browse files Browse the repository at this point in the history
fixed a typo (changed marge to merge)
  • Loading branch information
bhagu authored and sriramdasbalaji committed Aug 26, 2019
1 parent 86713d2 commit 2feefa2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions labs/azuredevops/pullrequests/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ When the Git lab ended, we had created a new branch and made a change to some of

![](images/018.png)

1. You can accept the default messages in the pull request dialog. The first option is to complete the work items linked to the branch being merged. Note that you also have the option to delete the target branch after merging, as well as the ability to **squash changes** during the marge. Squash merging is a merge option that allows you to condense the Git history of topic branches when you complete a pull request. Instead of each commit on the topic branch being added to the history of the default branch, a squash merge takes all the file changes and adds them to a single new commit on the default branch. Squash merging keeps your default branch histories clean and easy to follow without demanding any workflow changes on your team. Click **Complete merge**.
1. You can accept the default messages in the pull request dialog. The first option is to complete the work items linked to the branch being merged. Note that you also have the option to delete the target branch after merging, as well as the ability to **squash changes** during the merge. Squash merging is a merge option that allows you to condense the Git history of topic branches when you complete a pull request. Instead of each commit on the topic branch being added to the history of the default branch, a squash merge takes all the file changes and adds them to a single new commit on the default branch. Squash merging keeps your default branch histories clean and easy to follow without demanding any workflow changes on your team. Click **Complete merge**.

![](images/019.png)

Expand Down Expand Up @@ -191,4 +191,4 @@ As projects and teams scale in complexity, it becomes help to automate more of t

![](images/035.png)

{% include note.html content="If you plan to complete further labs, you may need to reverse the changes you made in **Task 3** above." %}
{% include note.html content="If you plan to complete further labs, you may need to reverse the changes you made in **Task 3** above." %}

0 comments on commit 2feefa2

Please sign in to comment.