Fix content issues for commonmark in "Pull requests" articles (#42137)

Alifsamad045 · Sep 7, 2023 · 72dfd5e · 72dfd5e
1 parent 5300043
commit 72dfd5e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...ull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github.md b/...ull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github.md
@@ -34,11 +34,12 @@ If a site administrator disables the merge conflict editor for pull requests bet
 
    ![Screenshot of a warning that a pull request has a merge conflict. The "Resolve merge conflicts" button is outlined in dark orange.](/assets/images/help/pull_requests/resolve-merge-conflicts-button.png)
 
- {% note %}
+   {% note %}
 
- **Note:** If the **Resolve conflicts** button is deactivated, your pull request's merge conflict is too complex to resolve on {% data variables.product.product_name %}{% ifversion ghes or ghae %} or the site administrator has disabled the conflict editor for pull requests between repositories{% endif %}. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. For more information see "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line)."
+   **Note:** If the **Resolve conflicts** button is deactivated, your pull request's merge conflict is too complex to resolve on {% data variables.product.product_name %}{% ifversion ghes or ghae %} or the site administrator has disabled the conflict editor for pull requests between repositories{% endif %}. You must resolve the merge conflict using an alternative Git client, or by using Git on the command line. For more information see "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line)."
+
+   {% endnote %}
 
- {% endnote %}
 {% data reusables.pull_requests.decide-how-to-resolve-competing-line-change-merge-conflict %}
 1. If you have more than one merge conflict in your file, scroll down to the next set of conflict markers and repeat steps four and five to resolve your merge conflict.
 1. Once you've resolved all the conflicts in the file, click **Mark as resolved**.

diff --git a/...corporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md b/...corporating-changes-from-a-pull-request/automatically-merging-a-pull-request.md
@@ -42,11 +42,11 @@ People with write permissions to a repository can enable auto-merge for a pull r
    {% ifversion fpt %}
 1. If you chose the merge or squash and merge methods, type a commit message and description and choose the email address you want to author the merge commit.
 
-  {% note %}
+   {% note %}
 
-  **Note:** The email dropdown menu is not available if you have email privacy enabled or if you only have one verified and visible email associated with your {% data variables.product.company_short %} account.
+   **Note:** The email dropdown menu is not available if you have email privacy enabled or if you only have one verified and visible email associated with your {% data variables.product.company_short %} account.
 
-  {% endnote %}
+   {% endnote %}
   {% endif %}
   {% ifversion ghes or ghae or ghec %}
 1. If you chose the merge or squash and merge methods, type a commit message and description.