jprdonnelly/docs
1
0
Fork 0
mirror of synced 2025-12-25 02:17:36 -05:00
Code Issues Projects Releases Wiki Activity

Remove merge conflict text (#31299)

Browse Source 
Co-authored-by: Alex Nguyen <150945400+nguyenalex836@users.noreply.github.com>
This commit is contained in:
tomstrong64
2024-01-26 18:45:59 +00:00
committed by GitHub
parent 9a22dfe883
commit 73098991be
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
content/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo.md
View File

@@ -233,11 +233,8 @@ Fork a repository to start contributing to a project. {% data reusables.reposito
You have now forked a repository, practiced cloning your fork, and configured an upstream repository.
<<<<<<< HEAD:content/get-started/quickstart/fork-a-repo.md
- For more information about cloning the fork and syncing the changes in a forked repository from your computer, see "[AUTOTITLE](/get-started/getting-started-with-git/set-up-git)."
=======
>>>>>>> main:content/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo.md
- You can also create a new repository where you can put all your projects and share the code on {% data variables.product.prodname_dotcom %}. {% data reusables.getting-started.create-a-repository %}"
- {% data reusables.getting-started.being-social %}