Github Basics with Visual Studio Code

Github_VSCode.md

Downloads

• https://git-scm.com/downloads
• https://code.visualstudio.com/

Resources

• https://guides.github.com/activities/hello-world/
• https://guides.github.com/introduction/getting-your-project-on-github/
• https://help.github.com/articles/github-glossary/
• https://code.visualstudio.com/docs/editor/versioncontrol
• https://gist.github.com/brygrill/b99fd518cf07c3424c94e9ed37a471ff
• https://help.github.com/articles/caching-your-github-password-in-git/
• https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/

Git + VS Code + Github Workflow

• Clone Repo
• Switch Branch
• Create new Branch
• Sync to Remote
• Stage and Commit changes
• Push changes
• Pull Request
• Merge branch
• Sync changes locally

Clone Repo

$ git clone https://github.com/facebook/react.git
$ cd react
$ code .

Switch Branch

In VS Code, click on the master branch in the bottom left corner of the screen. Select the new branch to checkout:

Create new Branch

Select Create new Branch:

Give it a useful name:

Sync to Remote

This step is not necessary, but I find it useful. Your new branch name will be reflected in the bottom left corner of VS Code. Clicking the cloud will push your branch to Github.

Select origin (Github):

Stage and Commit changes

Change can be viewed from the Source Control panel in VS Code. Select the files to stage and add a useful message.

Cmd/Ctrl + Enter will commit staged changes. Your commit count will accumulate on bottom bar:

Push changes

Push changes from the bottom bar:

On Github you will see the pushed branch:

Pull Request

Click on Compare & pull request:

Or:

• Pull Requests tab
• New Pull Request
  • Base is parent branch (dev)
  • Compare is your feature branch

Then click on Create pull request:

Merge Branch

Click on the Merge pull request button:

And confirm:

Then you can delete the branch if that makes sense for the project/branch:

All changes will now be reflected in the parent branch, dev in our case.

Sync changes locally

Check out the parent branch:

Your local version of the parent branch will be behind. Sync the changes from Github:

Optionally, delete your local branch:

$ git branch -d feature/<branch-name>

Optionally, prune origin so your list of remote branches is in sync with Github:

$ git remote prune origin

Before:

After: