Waypoint Ventures documentation

• Welcome
• Quick start
• Quick start
• Install software
• Set Git credentials
• Install Git client
• Install Git History extension
• Install Azure Repos extension
• Install Pull Requests extension
• Install Word Count extension
• Install Docs Authoring Pack
• Install Visual Studio Code
• Workflow and processes
• Test process
• Content editing process
• Instructional design review process
• Technical review process
• Authoring process
• General project workflow
• Terminology and concepts
• View/ download course files
• Fetch upstream changes
• Clone single folder
• Fix cloning errors
• Download course files (clone repo)
• Fork a repository
• View course files in web browser
• Working on branches
• Recover deleted branch
• Delete branch
• Rename branch
• Send (push) files
• Switch branches in VSC
• Update branch (pull) in VSC
• Create new branch in VSC
• Project branching policies
• Add/ edit content
• Create scaffolding
• Invite collaborator
• Fix linter issues
• Use author outlines
• Create new markdown file in VSC
• Add/ edit images in VSC
• Add/ edit markdown in VSC
• Add/ edit content in web browser
• Markdown syntax guide
• Pull requests and reviews
• Resolve merge conflicts
• Merge a pull request
• Work in a pull request
• Create pull request
• Pull requests overview
• Prepublication preparations
• Style a doc in Word
• Configure styles in Word
• Convert markdown to doc
• Setup file conversion tools
• About prepublication
• Appendices
• Links to useful resources
• Glossary
• FAQ
• Best practices guide

This guide describes how to fetch file changes from an upstream GitHub repository (repo), merge them into a GitHub fork, and pull the file changes from the GitHub fork into a local clone.

Prerequisites

• To follow this guide, you should be familiar with using Git, GitHub and Visual Studio Code (VSC).

Topics in this guide

• Fetch and merge files changes from upstream
• Pull file changes from a GitHub fork into a local clone

Fetch and merge files changes from upstream

This topic describes how to fetch file changes from the master branch of an upstream repo (Microsoft Docs), and merge these file changes into the master branch of a fork on GitHub.

1. Sign in at GitHub.com.

   Note: If prompted, on your GitHub landing page, follow the Single sign-on link, and then authenticate with your ‘v dash’ user account credentials.

2. Go to the URL for your GitHub fork (YourFork).

   For example, go to the URL https://github.com/< your-GitHub-username >/learn-pr.

3. On your GitHub fork's landing page, set the branch to master.

4. Select Fetch upstream.

   Note: Review the available options.

   • Compare. Examine the similarities and differences between the files in MicrosoftDocs:master and the files in YourFork:master.
   • Fetch and merge. Retrieve (fetch) all file changes from MicrosoftDocs:master that are not present in YourFork:master, and combine (merge) these file changes into YourFork:master.

5. Choose Fetch and merge.

   In the following image, the example GitHub fork mkavana:learn-pr is set to the master branch. Fetch upstream is selected, and the options to Compare or Fetch and merge are available.

   

Pull file changes from a GitHub fork into a local clone

This topic describes using VSC to pull file changes from the master branch of a GitHub fork into a local clone (on your computer).

1. Open VSC.

2. Open your local clone by using File > Open folder > Select folder (top menu).

3. Switch VSC to the master by branch using the branch selector icon (bottom left).

4. Select the Source Control icon (left side menu).

5. Choose the View and More Actions ellipses (...) icon.

6. From the View and More Actions menu, select Pull, Push > Pull from….

   The following image demonstrates the VSC user selections: Source Control > View and More Actions > Pull, Push > Pull from….

   

7. Choose the URL for your GitHub fork from the prompt to Pick a remote to pull the branch from….

   For example, in the following image, the chosen GitHub fork URL is origin https://github.com/mkavana/learn-pr.

   

8. Select origin/master from the prompt to Pick a branch to pull from.

   For example, in the following image the selected branch is origin/master.

   

Congratulations! You’ve fetched upstream file changes from MicrosoftDocs:master, merged them into the GitHub fork YourFork:master, and pulled the file changes from YourFork:master into a local clone.