updating content files
This commit is contained in:
Grace Park
@@ -18,7 +18,7 @@ topics:
|
||||
---
|
||||
To learn about accessing your personal dashboard, see "[About your personal dashboard](/articles/about-your-personal-dashboard)."
|
||||
|
||||
### Following people
|
||||
## Following people
|
||||
|
||||
When you follow someone on {% data variables.product.product_location %}, you'll get notifications on your personal dashboard about their activity. For more information, see "[About your personal dashboard](/articles/about-your-personal-dashboard)."
|
||||
|
||||
@@ -26,7 +26,7 @@ Click **Follow** on a person's profile page to follow them.
|
||||
|
||||
|
||||
|
||||
### Watching a repository
|
||||
## Watching a repository
|
||||
|
||||
You can watch a repository to receive notifications for new pull requests and issues. When the owner updates the repository, you'll see the changes in your personal dashboard. For more information see {% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.20" %}"[Viewing your subscriptions](/github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions){% else %}"[Watching and unwatching repositories](/github/receiving-notifications-about-activity-on-github/watching-and-unwatching-repositories){% endif %}."
|
||||
|
||||
@@ -34,39 +34,39 @@ Click **Watch** at the top of a repository to watch it.
|
||||
|
||||
|
||||
|
||||
### Joining the conversation
|
||||
## Joining the conversation
|
||||
|
||||
{% data reusables.support.ask-and-answer-forum %}
|
||||
|
||||
### Communicating on {% data variables.product.product_name %}
|
||||
## Communicating on {% data variables.product.product_name %}
|
||||
|
||||
{% data variables.product.product_name %} provides built-in collaborative communication tools, such as issues and pull requests, allowing you to interact closely with your community when building great software. For an overview of these tools, and information about the specificity of each, see "[Quickstart for communicating on {% data variables.product.prodname_dotcom %}](/github/collaborating-with-issues-and-pull-requests/quickstart-for-communicating-on-github)."
|
||||
|
||||
### Doing even more
|
||||
## Doing even more
|
||||
|
||||
#### Creating pull requests
|
||||
### Creating pull requests
|
||||
|
||||
You may want to contribute to another person's project, whether to add features or to fix bugs. After making changes, let the original author know by sending a pull request. For more information, see "[About pull requests](/articles/about-pull-requests)."
|
||||
|
||||
|
||||
|
||||
#### Using issues
|
||||
### Using issues
|
||||
|
||||
When collaborating on a repository, use issues to track ideas, enhancements, tasks, or bugs. For more information, see '[About issues](/articles/about-issues/)."
|
||||
|
||||
|
||||
|
||||
#### Participating in organizations
|
||||
### Participating in organizations
|
||||
|
||||
Organizations are shared accounts where businesses and open-source projects can collaborate across many projects at once. Owners and administrators can establish teams with special permissions, have a public organization profile, and keep track of activity within the organization. For more information, see "[About organizations](/articles/about-organizations/)."
|
||||
|
||||
|
||||
|
||||
#### Exploring other projects on {% data variables.product.prodname_dotcom %}
|
||||
### Exploring other projects on {% data variables.product.prodname_dotcom %}
|
||||
|
||||
Discover interesting projects using {% data variables.explore.explore_github %}, [Explore repositories](https://github.com/explore), and the {% data variables.explore.trending_page %}. Star interesting projects and come back to them later. Visit your {% data variables.explore.your_stars_page %} to see all your starred projects. For more information, see "[About your personal dashboard](/articles/about-your-personal-dashboard/)."
|
||||
|
||||
### Celebrate
|
||||
## Celebrate
|
||||
|
||||
You're now connected to the {% data variables.product.product_name %} community. What do you want to do next?
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
---
|
||||
title: Communicating on GitHub
|
||||
intro: 'You can discuss specific projects and changes, as well as broader ideas or team goals, using different types of discussions on {% data variables.product.product_name %}.'
|
||||
miniTocMaxHeadingLevel: 4
|
||||
miniTocMaxHeadingLevel: 3
|
||||
redirect_from:
|
||||
- /github/collaborating-with-issues-and-pull-requests/getting-started/quickstart-for-communicating-on-github
|
||||
- /articles/about-discussions-in-issues-and-pull-requests/
|
||||
@@ -17,7 +17,7 @@ topics:
|
||||
- Discussions
|
||||
- Fundamentals
|
||||
---
|
||||
### Introduction
|
||||
## Introduction
|
||||
|
||||
{% data variables.product.product_name %} provides built-in collaborative communication tools allowing you to interact closely with your community. This quickstart guide will show you how to pick the right tool for your needs.
|
||||
|
||||
@@ -28,18 +28,18 @@ You can create and participate in issues, pull requests, {% data variables.produ
|
||||
You can create and participate in issues, pull requests and team discussions, depending on the type of conversation you'd like to have.
|
||||
{% endif %}
|
||||
|
||||
#### Issues
|
||||
### Issues
|
||||
- are useful for discussing specific details of a project such as bug reports, planned improvements and feedback.
|
||||
- are specific to a repository, and usually have a clear owner.
|
||||
- are often referred to as {% data variables.product.prodname_dotcom %}'s bug-tracking system.
|
||||
|
||||
#### Pull requests
|
||||
### Pull requests
|
||||
- allow you to propose specific changes.
|
||||
- allow you comment directly on proposed changes suggested by others.
|
||||
- are specific to a repository.
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" %}
|
||||
#### {% data variables.product.prodname_discussions %}
|
||||
### {% data variables.product.prodname_discussions %}
|
||||
- are like a forum, and are best used for open-form ideas and discussions where collaboration is important.
|
||||
- may span many repositories.
|
||||
- provide a collaborative experience outside the codebase, allowing the brainstorming of ideas, and the creation of a community knowledge base.
|
||||
@@ -47,23 +47,23 @@ You can create and participate in issues, pull requests and team discussions, de
|
||||
- often do not result in an actionable task.
|
||||
{% endif %}
|
||||
|
||||
#### Team discussions
|
||||
### Team discussions
|
||||
- can be started on your team's page for conversations that span across projects and don't belong in a specific issue or pull request. Instead of opening an issue in a repository to discuss an idea, you can include the entire team by having a conversation in a team discussion.
|
||||
- allow you to hold discussions with your team about planning, analysis, design, user research and general project decision making in one place.{% if currentVersion ver_gt "enterprise-server@2.20" or currentVersion == "github-ae@latest" %}
|
||||
- provide a collaborative experience outside the codebase, allowing the brainstorming of ideas.
|
||||
- often don’t have a clear owner.
|
||||
- often do not result in an actionable task.{% endif %}
|
||||
|
||||
### Which discussion tool should I use?
|
||||
## Which discussion tool should I use?
|
||||
|
||||
#### Scenarios for issues
|
||||
### Scenarios for issues
|
||||
|
||||
- I want to keep track of tasks, enhancements and bugs.
|
||||
- I want to file a bug report.
|
||||
- I want to share feedback about a specific feature.
|
||||
- I want to ask a question about files in the repository.
|
||||
|
||||
##### Issue example
|
||||
#### Issue example
|
||||
|
||||
This example illustrates how a {% data variables.product.prodname_dotcom %} user created an issue in our documentation open source repository to make us aware of a bug, and discuss a fix.
|
||||
|
||||
@@ -74,14 +74,14 @@ This example illustrates how a {% data variables.product.prodname_dotcom %} user
|
||||
- A discussion ensues, and eventually, a consensus will be reached about the fix to apply.
|
||||
- A contributor can then create a pull request with the fix.
|
||||
|
||||
#### Scenarios for pull requests
|
||||
### Scenarios for pull requests
|
||||
|
||||
- I want to fix a typo in a repository.
|
||||
- I want to make changes to a repository.
|
||||
- I want to make changes to fix an issue.
|
||||
- I want to comment on changes suggested by others.
|
||||
|
||||
##### Pull request example
|
||||
#### Pull request example
|
||||
|
||||
This example illustrates how a {% data variables.product.prodname_dotcom %} user created a pull request in our documentation open source repository to fix a typo.
|
||||
|
||||
@@ -98,14 +98,14 @@ The **Files changed** tab of the pull request shows the implemented fix.
|
||||
- A repository maintainer reviews the pull request, comments on it, and merges it.
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" %}
|
||||
#### Scenarios for {% data variables.product.prodname_discussions %}
|
||||
### Scenarios for {% data variables.product.prodname_discussions %}
|
||||
|
||||
- I have a question that's not necessarily related to specific files in the repository.
|
||||
- I want to share news with my collaborators, or my team.
|
||||
- I want to start or participate in an open-ended conversation.
|
||||
- I want to make an announcement to my community.
|
||||
|
||||
##### {% data variables.product.prodname_discussions %} example
|
||||
#### {% data variables.product.prodname_discussions %} example
|
||||
|
||||
This example shows the {% data variables.product.prodname_discussions %} welcome post for the {% data variables.product.prodname_dotcom %} Docs open source repository, and illustrates how the team wants to collaborate with their community.
|
||||
|
||||
@@ -115,7 +115,7 @@ This community maintainer started a discussion to welcome the community, and to
|
||||
|
||||
{% endif %}
|
||||
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.20" or currentVersion == "github-ae@latest" %}
|
||||
#### Scenarios for team discussions
|
||||
### Scenarios for team discussions
|
||||
|
||||
- I have a question that's not necessarily related to specific files in the repository.
|
||||
- I want to share news with my collaborators, or my team.
|
||||
@@ -126,7 +126,7 @@ This community maintainer started a discussion to welcome the community, and to
|
||||
As you can see, team discussions are very similar to {% data variables.product.prodname_discussions %}. For {% data variables.product.prodname_dotcom_the_website %}, we recommend using {% data variables.product.prodname_discussions %} as the starting point for conversations. You can use {% data variables.product.prodname_discussions %} to collaborate with any community on {% data variables.product.prodname_dotcom %}. If you are part of an organization, and would like to initiate conversations within your organization or team within that organization, you should use team discussions.
|
||||
{% endif %}
|
||||
|
||||
##### Team discussion example
|
||||
#### Team discussion example
|
||||
|
||||
This example shows a team post for the `octo-team` team.
|
||||
|
||||
@@ -139,7 +139,7 @@ The `octocat` team member posted a team discussion, informing the team of variou
|
||||
|
||||
{% endif %}
|
||||
|
||||
### Next steps
|
||||
## Next steps
|
||||
|
||||
These examples showed you how to decide which is the best tool for your conversations on {% data variables.product.product_name %}. But this is only the beginning; there is so much more you can do to tailor these tools to your needs.
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ topics:
|
||||
- Notifications
|
||||
- Accounts
|
||||
---
|
||||
### Create a repository
|
||||
## Create a repository
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" %}
|
||||
|
||||
@@ -56,7 +56,7 @@ Congratulations! You've successfully created your first repository, and initiali
|
||||
{% endtip %}
|
||||
{% endif %}
|
||||
|
||||
### Commit your first change
|
||||
## Commit your first change
|
||||
|
||||
A *[commit](/articles/github-glossary#commit)* is like a snapshot of all the files in your project at a particular point in time.
|
||||
|
||||
@@ -76,7 +76,7 @@ Let's commit a change to the *README* file.
|
||||
{% data reusables.files.choose_commit_branch %}
|
||||
{% data reusables.files.propose_file_change %}
|
||||
|
||||
### Celebrate
|
||||
## Celebrate
|
||||
|
||||
Congratulations! You have now created a repository, including a *README* file, and created your first commit on {% data variables.product.product_location %}. What do you want to do next?
|
||||
|
||||
|
||||
@@ -16,11 +16,11 @@ topics:
|
||||
- Notifications
|
||||
- Accounts
|
||||
---
|
||||
### About forks
|
||||
## About forks
|
||||
|
||||
Most commonly, forks are used to either propose changes to someone else's project or to use someone else's project as a starting point for your own idea. You can fork a repository to create a copy of the repository and make changes without affecting the upstream repository. For more information, see "[Working with forks](/github/collaborating-with-issues-and-pull-requests/working-with-forks)."
|
||||
|
||||
#### Propose changes to someone else's project
|
||||
### Propose changes to someone else's project
|
||||
|
||||
For example, you can use forks to propose changes related to fixing a bug. Rather than logging an issue for a bug you've found, you can:
|
||||
|
||||
@@ -28,7 +28,7 @@ For example, you can use forks to propose changes related to fixing a bug. Rathe
|
||||
- Make the fix.
|
||||
- Submit a pull request to the project owner.
|
||||
|
||||
#### Use someone else's project as a starting point for your own idea.
|
||||
### Use someone else's project as a starting point for your own idea.
|
||||
|
||||
Open source software is based on the idea that by sharing code, we can make better, more reliable software. For more information, see the "[About the Open Source Initiative](http://opensource.org/about)" on the Open Source Initiative.
|
||||
|
||||
@@ -56,7 +56,7 @@ When creating your public repository from a fork of someone's project, make sure
|
||||
{% endtip %}
|
||||
{% endif %}
|
||||
|
||||
### Fork an example repository
|
||||
## Fork an example repository
|
||||
|
||||
Forking a repository is a simple two-step process. We've created a repository for you to practice with.
|
||||
|
||||
@@ -64,15 +64,15 @@ Forking a repository is a simple two-step process. We've created a repository fo
|
||||
2. In the top-right corner of the page, click **Fork**.
|
||||
|
||||
|
||||
### Keep your fork synced
|
||||
## Keep your fork synced
|
||||
|
||||
You might fork a project to propose changes to the upstream, or original, repository. In this case, it's good practice to regularly sync your fork with the upstream repository. To do this, you'll need to use Git on the command line. You can practice setting the upstream repository using the same [octocat/Spoon-Knife](https://github.com/octocat/Spoon-Knife) repository you just forked.
|
||||
|
||||
#### Step 1: Set up Git
|
||||
### Step 1: Set up Git
|
||||
|
||||
If you haven't yet, you should first [set up Git](/articles/set-up-git). Don't forget to [set up authentication to {% data variables.product.product_location %} from Git](/articles/set-up-git#next-steps-authenticating-with-github-from-git) as well.
|
||||
|
||||
#### Step 2: Create a local clone of your fork
|
||||
### Step 2: Create a local clone of your fork
|
||||
|
||||
Right now, you have a fork of the Spoon-Knife repository, but you don't have the files in that repository on your computer. Let's create a clone of your fork locally on your computer.
|
||||
|
||||
@@ -96,7 +96,7 @@ Right now, you have a fork of the Spoon-Knife repository, but you don't have the
|
||||
```
|
||||
Now, you have a local copy of your fork of the Spoon-Knife repository.
|
||||
|
||||
#### Step 3: Configure Git to sync your fork with the original Spoon-Knife repository
|
||||
### Step 3: Configure Git to sync your fork with the original Spoon-Knife repository
|
||||
|
||||
When you fork a project in order to propose changes to the original repository, you can configure Git to pull changes from the original, or upstream, repository into the local clone of your fork.
|
||||
|
||||
@@ -131,21 +131,21 @@ When you fork a project in order to propose changes to the original repository,
|
||||
|
||||
Now, you can keep your fork synced with the upstream repository with a few Git commands. For more information, see "[Syncing a fork](/articles/syncing-a-fork)."
|
||||
|
||||
#### Next steps
|
||||
### Next steps
|
||||
|
||||
You can make any changes to a fork, including:
|
||||
|
||||
- **Creating branches:** [*Branches*](/articles/creating-and-deleting-branches-within-your-repository/) allow you to build new features or test out ideas without putting your main project at risk.
|
||||
- **Opening pull requests:** If you are hoping to contribute back to the original repository, you can send a request to the original author to pull your fork into their repository by submitting a [pull request](/articles/about-pull-requests).
|
||||
|
||||
### Find another repository to fork
|
||||
## Find another repository to fork
|
||||
Fork a repository to start contributing to a project. {% data reusables.repositories.you-can-fork %}
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" %}You can browse [Explore](https://github.com/explore) to find projects and start contributing to open source repositories. For more information, see "[Finding ways to contribute to open source on {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github)."
|
||||
|
||||
{% endif %}
|
||||
|
||||
### Celebrate
|
||||
## Celebrate
|
||||
|
||||
You have now forked a repository, practiced cloning your fork, and configured an upstream repository. What do you want to do next?
|
||||
|
||||
|
||||
@@ -13,11 +13,11 @@ versions:
|
||||
authors:
|
||||
- GitHub
|
||||
---
|
||||
### Using Git
|
||||
## Using Git
|
||||
|
||||
Familiarize yourself with Git by visiting the [official Git project site](https://git-scm.com) and reading the [ProGit book](http://git-scm.com/book). You can review the [Git command list](https://git-scm.com/docs) or [Git command lookup reference](http://gitref.org) while using the [Try Git](https://try.github.com) simulator.
|
||||
|
||||
### Using {% data variables.product.product_name %}
|
||||
## Using {% data variables.product.product_name %}
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" %}
|
||||
|
||||
@@ -29,29 +29,29 @@ Become better acquainted with {% data variables.product.product_name %} through
|
||||
|
||||
{% data reusables.support.ask-and-answer-forum %}
|
||||
|
||||
#### Branches, forks, and pull requests
|
||||
### Branches, forks, and pull requests
|
||||
|
||||
Learn about [Git branching](http://learngitbranching.js.org/) using an interactive tool. Read about [forks](/articles/about-forks) and [pull requests](/articles/using-pull-requests) as well as [how we use pull requests](https://github.com/blog/1124-how-we-use-pull-requests-to-build-github) at {% data variables.product.prodname_dotcom %}. Access references about using {% data variables.product.prodname_dotcom %} from the [command line](https://cli.github.com/).
|
||||
|
||||
#### Tune in
|
||||
### Tune in
|
||||
|
||||
Our {% data variables.product.prodname_dotcom %} [YouTube Training and Guides channel](https://youtube.com/githubguides) offers tutorials about [pull requests](https://www.youtube.com/watch?v=d5wpJ5VimSU&list=PLg7s6cbtAD15G8lNyoaYDuKZSKyJrgwB-&index=19), [forking](https://www.youtube.com/watch?v=5oJHRbqEofs), [rebase](https://www.youtube.com/watch?v=SxzjZtJwOgo&list=PLg7s6cbtAD15G8lNyoaYDuKZSKyJrgwB-&index=22), and [reset](https://www.youtube.com/watch?v=BKPjPMVB81g) functions. Each topic is covered in 5 minutes or less.
|
||||
|
||||
### Training
|
||||
## Training
|
||||
|
||||
#### Free courses
|
||||
### Free courses
|
||||
|
||||
{% data variables.product.product_name %} offers a series of interactive, [on-demand training courses](https://lab.github.com/) including [Introduction to {% data variables.product.prodname_dotcom %}](https://lab.github.com/githubtraining/introduction-to-github); courses on programming languages and tools such as HTML, Python, and NodeJS; and courses on {% data variables.product.product_name %} specific tools such as {% data variables.product.prodname_actions %}.
|
||||
|
||||
#### {% data variables.product.prodname_dotcom %}'s web-based educational programs
|
||||
### {% data variables.product.prodname_dotcom %}'s web-based educational programs
|
||||
|
||||
{% data variables.product.prodname_dotcom %} offers live [trainings](https://services.github.com/#upcoming-events) with a hands-on, project-based approach for those who love the command line and those who don't.
|
||||
|
||||
#### Training for your company
|
||||
### Training for your company
|
||||
|
||||
{% data variables.product.prodname_dotcom %} offers [in-person classes](https://services.github.com/#offerings) taught by our highly-experienced educators. [Contact us](https://services.github.com/#contact) to ask your training-related questions.
|
||||
|
||||
### Extras
|
||||
## Extras
|
||||
|
||||
An interactive [online Git course](http://www.codeschool.com/courses/git-real) from [Code School](http://codeschool.com) has seven levels with dozens of exercises in a fun game format. Feel free to adapt our [.gitignore templates](https://github.com/github/gitignore) to meet your needs.
|
||||
|
||||
|
||||
@@ -14,17 +14,17 @@ versions:
|
||||
topics:
|
||||
- Pull requests
|
||||
- Fundamentals
|
||||
miniTocMaxHeadingLevel: 4
|
||||
miniTocMaxHeadingLevel: 3
|
||||
---
|
||||
### Introduction
|
||||
## Introduction
|
||||
|
||||
{% data variables.product.prodname_dotcom %} flow is a lightweight, branch-based workflow. The {% data variables.product.prodname_dotcom %} flow is useful for everyone, not just developers. For example, here at {% data variables.product.prodname_dotcom %}, we use {% data variables.product.prodname_dotcom %} flow for our [site policy](https://github.com/github/site-policy), [documentation](https://github.com/github/docs), and [roadmap](https://github.com/github/roadmap).
|
||||
|
||||
### Prerequisites
|
||||
## Prerequisites
|
||||
|
||||
To follow {% data variables.product.prodname_dotcom %} flow, you will need {% data variables.product.prodname_dotcom %} account and a repository. For information on how to create an account, see "[Signing up for {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/signing-up-for-github)." For information on how to create a repository, see "[Create a repo](/github/getting-started-with-github/create-a-repo)."{% if currentVersion == "free-pro-team@latest" %} For information on how to find an existing repository to contribute to, see "[Finding ways to contribute to open source on {% data variables.product.prodname_dotcom %}](/github/getting-started-with-github/finding-ways-to-contribute-to-open-source-on-github)."{% endif %}
|
||||
|
||||
### Following {% data variables.product.prodname_dotcom %} flow
|
||||
## Following {% data variables.product.prodname_dotcom %} flow
|
||||
|
||||
{% tip %}
|
||||
|
||||
@@ -36,13 +36,13 @@ To follow {% data variables.product.prodname_dotcom %} flow, you will need {% da
|
||||
|
||||
{% endtip %}
|
||||
|
||||
#### Create a branch
|
||||
### Create a branch
|
||||
|
||||
Create a branch in your repository. A short, descriptive branch name enables your collaborators to see ongoing work at a glance. For example, `increase-test-timeout` or `add-code-of-conduct`. For more information, see "[Creating and deleting branches within your repository](/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository)."
|
||||
|
||||
By creating a branch, you create a space to work without affecting the default branch. Additionally, you give collaborators a chance to review your work.
|
||||
|
||||
#### Make changes
|
||||
### Make changes
|
||||
|
||||
On your branch, make any desired changes to the repository. For more information, see "[Creating new files](/articles/creating-new-files)," "[Editing files](/articles/editing-files)," "[Renaming a file](/articles/renaming-a-file)," "[Moving a file to a new location](/articles/moving-a-file-to-a-new-location)," or "[Deleting files in a repository](/github/managing-files-in-a-repository/deleting-files-in-a-repository)."
|
||||
|
||||
@@ -62,7 +62,7 @@ Continue to make, commit, and push changes to your branch until you are ready to
|
||||
|
||||
{% endtip %}
|
||||
|
||||
#### Create a pull request
|
||||
### Create a pull request
|
||||
|
||||
Create a pull request to ask collaborators for feedback on your changes. Pull request review is so valuable that some repositories require an approving review before pull requests can be merged. If you want early feedback or advice before you complete your changes, you can mark your pull request as a draft. For more information, see "[Creating a pull request](/articles/creating-a-pull-request)."
|
||||
|
||||
@@ -78,13 +78,13 @@ Your repository may be configured to automatically request a review from specifi
|
||||
|
||||
If your repository has checks configured to run on pull requests, you will see any checks that failed on your pull request. This helps you catch errors before merging your branch. For more information, see "[About status checks](/github/collaborating-with-issues-and-pull-requests/about-status-checks)."
|
||||
|
||||
#### Address review comments
|
||||
### Address review comments
|
||||
|
||||
Reviewers should leave questions, comments, and suggestions. Reviewers can comment on the whole pull request or add comments to specific lines. You and reviewers can insert images or code suggestions to clarify comments. For more information, see "[Reviewing changes in pull requests](/github/collaborating-with-issues-and-pull-requests/reviewing-changes-in-pull-requests)."
|
||||
|
||||
You can continue to commit and push changes in response to the reviews. Your pull request will update automatically.
|
||||
|
||||
#### Merge your pull request
|
||||
### Merge your pull request
|
||||
|
||||
Once your pull request is approved, merge your pull request. This will automatically merge your branch so that your changes appear on the default branch. {% data variables.product.prodname_dotcom %} retains the history of comments and commits in the pull request to help future contributors understand your changes. For more information, see "[Merging a pull request](/articles/merging-a-pull-request)."
|
||||
|
||||
@@ -92,7 +92,7 @@ Once your pull request is approved, merge your pull request. This will automatic
|
||||
|
||||
Branch protection settings may block merging if your pull request does not meet certain requirements. For example, you need a certain number of approving reviews or an approving review from a specific team. For more information, see "[About protected branches](/github/administering-a-repository/about-protected-branches)."
|
||||
|
||||
#### Delete your branch
|
||||
### Delete your branch
|
||||
|
||||
After you merge your pull request, delete your branch. This indicates that the work on the branch is complete and prevents you or others from accidentally using old branches. For more information, see "[Deleting and restoring branches in a pull request](/github/administering-a-repository/deleting-and-restoring-branches-in-a-pull-request)."
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ versions:
|
||||
|
||||
---
|
||||
|
||||
### Further reading
|
||||
## Further reading
|
||||
|
||||
- [The Official Git Glossary](https://www.kernel.org/pub/software/scm/git/docs/gitglossary.html)
|
||||
- [Git Reference](http://gitref.org/)
|
||||
|
||||
@@ -22,7 +22,7 @@ topics:
|
||||
- Notifications
|
||||
- Accounts
|
||||
---
|
||||
### Using Git
|
||||
## Using Git
|
||||
|
||||
To use Git on the command line, you'll need to download, install, and configure Git on your computer. {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.19" or currentVersion == "github-ae@latest" %} You can also install {% data variables.product.prodname_cli %} to use {% data variables.product.product_name %} from the command line. For more information on {% data variables.product.prodname_cli %}, see the [{% data variables.product.prodname_cli %}](https://cli.github.com/manual/) documentation.{% endif %}
|
||||
|
||||
@@ -35,25 +35,25 @@ If you don't need to work with files locally, {% data variables.product.product_
|
||||
- [Managing files](/articles/managing-files-on-github/)
|
||||
- [Being social](/articles/be-social)
|
||||
|
||||
### Setting up Git
|
||||
## Setting up Git
|
||||
|
||||
1. [Download and install the latest version of Git](https://git-scm.com/downloads).
|
||||
2. [Set your username in Git](/github/getting-started-with-github/setting-your-username-in-git).
|
||||
3. [Set your commit email address in Git](/articles/setting-your-commit-email-address).
|
||||
|
||||
### Next steps: Authenticating with {% data variables.product.prodname_dotcom %} from Git
|
||||
## Next steps: Authenticating with {% data variables.product.prodname_dotcom %} from Git
|
||||
|
||||
When you connect to a {% data variables.product.product_name %} repository from Git, you'll need to authenticate with {% data variables.product.product_name %} using either HTTPS or SSH.
|
||||
|
||||
#### Connecting over HTTPS (recommended)
|
||||
### Connecting over HTTPS (recommended)
|
||||
|
||||
If you [clone with HTTPS](/github/getting-started-with-github/about-remote-repositories/#cloning-with-https-urls), you can [cache your {% data variables.product.prodname_dotcom %} credentials in Git](/github/getting-started-with-github/caching-your-github-credentials-in-git) using a credential helper.
|
||||
|
||||
#### Connecting over SSH
|
||||
### Connecting over SSH
|
||||
|
||||
If you [clone with SSH](/github/getting-started-with-github/about-remote-repositories/#cloning-with-ssh-urls), you must [generate SSH keys](/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent) on each computer you use to push or pull from {% data variables.product.product_name %}.
|
||||
|
||||
### Celebrate
|
||||
## Celebrate
|
||||
|
||||
Congratulations, you now have Git and {% data variables.product.product_name %} all set up! What do you want to do next?
|
||||
|
||||
|
||||
Reference in New Issue
Block a user