Line edits

Author: lootle1

learn-pr/github/resolve-merge-conflicts-github/includes/2-what-are-merge-conflicts.md

@@ -55,4 +55,4 @@ In addition to mitigating the impact of merge conflicts, pulling updates also al
 
 The `git rebase` (or `git pull --rebase`) command rewrites your branch history to use the current HEAD commit of the base branch as its base. In other words, your branch is updated to behave as though it were only branched from the current state of the base branch. This rebase means that all of your changes are compared to the latest state of the base branch, and not the original commit you originally branched from. Rebasing can make history easier to track after your eventual merge, because your commits will follow the previous parallel commits in a linear fashion. It's a good practice to rebase your branch immediately prior to merging upstream.
 
-Learn more [about Git rebase](https://docs.github.com/get-started/using-git/about-git-rebase) and [resolving merge conflicts after a Git rebase](https://docs.github.com/get-started/using-git/resolving-merge-conflicts-after-a-git-rebase).
+Learn more [about Git rebase](https://docs.github.com/get-started/using-git/about-git-rebase) and [resolving merge conflicts after a Git rebase](https://docs.github.com/get-started/using-git/resolving-merge-conflicts-after-a-git-rebase).

learn-pr/github/resolve-merge-conflicts-github/index.yml

@@ -11,10 +11,10 @@ metadata:
 title: "Settle competing commits by using merge conflict resolution on GitHub"
 summary: Learn to settle overlapping commits across branches by using merge conflict resolution.
 abstract: |
-  In this module, you will:
-  - Understand how merging happens and what causes merge conflicts
-  - Resolve simple and complex merge conflicts with ease
-  - Share best practices to reduce merge conflicts with your team
+  In this module, you'll:
+  - Understand how merging happens and what causes merge conflicts.
+  - Resolve simple and complex merge conflicts with ease.
+  - Share best practices to reduce merge conflicts with your team.
 prerequisites: |
   - A GitHub account
   - The ability to navigate and edit files in GitHub