Skip to content

Commit 207572f

Browse files
authored
Merge pull request github#28513 from github/repo-sync
repo sync
2 parents dc625d8 + 46dd055 commit 207572f

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

content/get-started/quickstart/contributing-to-projects.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ gh repo fork <em>repository</em> --clone=true
8282

8383
## Making and pushing changes
8484

85-
Go ahead and make a few changes to the project using your favorite text editor, like [Atom](https://atom.io). You could, for example, change the text in `index.html` to add your GitHub username.
85+
Go ahead and make a few changes to the project using your favorite text editor, like [Visual Studio Code](https://code.visualstudio.com). You could, for example, change the text in `index.html` to add your GitHub username.
8686

8787
When you're ready to submit your changes, stage and commit your changes. `git add .` tells Git that you want to include all of your changes in the next commit. `git commit` takes a snapshot of those changes.
8888

content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,8 @@ Before you can sync your fork with an upstream repository, you must [configure a
7777
> 2 files changed, 7 insertions(+), 9 deletions(-)
7878
> delete mode 100644 README
7979
> create mode 100644 README.md
80-
``` If your local branch didn't have any unique commits, Git will instead perform a "fast-forward":
81-
```shell
82-
$ git merge upstream/main
83-
> Updating 34e91da..16c56ad
84-
> Fast-forward
85-
> README.md | 5 +++--
86-
> 1 file changed, 3 insertions(+), 2 deletions(-)
87-
```
80+
```
81+
8882

8983
{% tip %}
9084

content/rest/overview/libraries.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ topics:
2626

2727
{% warning %}
2828

29-
Warning: As of late October 2021, the offical Octokit libraries are not currently maintained. For more information, see [this discussion in the octokit.js repository](https://github.com/octokit/octokit.js/discussions/620).
29+
Warning: As of late October 2021, the official Octokit libraries are not currently maintained. For more information, see [this discussion in the octokit.js repository](https://github.com/octokit/octokit.js/discussions/620).
3030

3131
{% endwarning %}
3232

0 commit comments

Comments
 (0)