Skip to content

Commit 36b724e

Browse files
committed
Merge branch 'copilot-ga-megabranch' into landing-page
2 parents d63b741 + f117de3 commit 36b724e

File tree

1,351 files changed

+10259
-4935
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,351 files changed

+10259
-4935
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ When you're finished with the changes, create a pull request, also known as a PR
7777
Once you submit your PR, a Docs team member will review your proposal. We may ask questions or request for additional information.
7878
- We may ask for changes to be made before a PR can be merged, either using [suggested changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request) or pull request comments. You can apply suggested changes directly through the UI. You can make any other changes in your fork, then commit them to your branch.
7979
- As you update your PR and apply changes, mark each conversation as [resolved](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#resolving-conversations).
80-
- If you run into any merge issues, checkout this [git tutorial](https://lab.github.com/githubtraining/managing-merge-conflicts) to help you resolve merge conflicts and other issues.
80+
- If you run into any merge issues, checkout this [git tutorial](https://github.com/skills/resolve-merge-conflicts) to help you resolve merge conflicts and other issues.
8181

8282
### Your PR is merged!
8383

14.7 KB
Loading
20.8 KB
Loading
18.7 KB
Loading
-729 Bytes
Loading
-6.15 KB
Binary file not shown.
27.9 KB
Loading

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/about-your-personal-dashboard.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ You can also find a list of your recently visited repositories, teams, and proje
4141

4242
## Staying updated with activity from the community
4343

44-
{% if for-you-feed %}
44+
{% ifversion for-you-feed %}
4545
The main section of your dashboard has two activity feeds:
4646

4747
- Following: Activity by people you follow and from repositories you watch.
@@ -68,7 +68,7 @@ You'll see updates in your news feed when a user you follow:
6868

6969
For more information about following people and watching repositories, see "[Following people](/get-started/exploring-projects-on-github/following-people)" and "[Be social](/get-started/quickstart/be-social)."
7070

71-
{% if for-you-feed %}
71+
{% ifversion for-you-feed %}
7272
### For you feed
7373

7474
{% note %}

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/managing-your-theme-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You may want to use a dark theme to reduce power consumption on certain devices,
3939
{% ifversion fpt or ghec %}
4040
- If you would like to choose a theme which is currently in public beta, you will first need to enable it with feature preview. For more information, see "[Exploring early access releases with feature preview](/get-started/using-github/exploring-early-access-releases-with-feature-preview)."{% endif %}
4141

42-
{% if command-palette %}
42+
{% ifversion command-palette %}
4343

4444
{% note %}
4545

0 commit comments

Comments
 (0)