VS Code Can Do That - Workshop
Main
Main
  • VS Code Can Do That Workshop
  • Essential Keyboard Shortcuts
  • Exercise 1 - Customizing The Editor
    • Customizing The Editor
    • Switch themes
    • Install a new icon theme
    • Switch fonts
    • Editor tweaks
    • Change default Settings view
    • Easily identify editor instances
  • Exercise 2 - Productivity Tricks
    • Productivity Tricks
    • Essential navigation shortcuts
    • Creating HTML with Emmet
    • Styling with Emmet
    • Update image sizes
  • Exercise 3 - Navigation And Refactoring
    • Navigation And Refactoring
    • Moving, Duplicating and Deleting
    • Folding sections
    • Multiple cursors
    • Rename refactor
    • Finding things
    • Extract refactor
  • Exercise 4 - Debugging
    • Debugging
    • Simple debugging
    • Simple launch config
    • Auto attach
    • Debugging browser apps
    • Compound debug configurations
  • Exercise 5 - Docker
    • Docker
    • Dockerizing an application
    • Running and inspecting images
    • Docker compose
    • Debugging Docker containers
  • Exercise 6 - Remote Development
    • Remote Development
    • Create a remote container
    • Create a new function in the container
    • Handling extensions
  • Exercise 7 - Working With Data
    • Working with data
    • Working with MongoDB
    • Working with SQLite
    • Working with MySQL
  • Exercise 8 - Git and Source Control
    • Git and source control
    • Cloning repos with VS Code
    • Common Git workflows
    • Branching and merge conflicts
Powered by GitBook
On this page

Was this helpful?

  1. Exercise 8 - Git and Source Control

Common Git workflows

PreviousCloning repos with VS CodeNextBranching and merge conflicts

Last updated 5 years ago

Was this helpful?

Git is a powerful tool, but it can be quite confusing. There are a lot of commands to remember, and resolving conflicts is just a complicated concept in general. In this exercise, you'll learn the most common and easiest to use workflow for Git within VS Code.

  • Modify both of the meta tag descriptions in the "index.html" file

  • Stage both files

  • Commit both files

  • Push changes to Github

  • Open the "index.html" file

  • Highlight "I LOVE LAMP" on line 7 and press Cmd/Ctrl + D to add a cursor to the second instance on the line below.

  • Change the value to "I love lamp"

  • Open the Source Control Explorer view (Ctrl + Shift + G)

  • Click the "+" button next to the "index.html" file to stage it

  • Add a message to the "Message" box and press Cmd/Ctrl + Enter

  • Undo the commit by pressing the ellipsis in the top right corner and select "Undo Last Commit"

  • Change the commit message to "Better description"

  • Press Cmd/Ctrl + Enter to commit

  • Use the button the bottom status bar to push changes to your repo

  • Open the Settings file (Cmd/Ctrl + ,)

  • Add the following line so that VS Code can automatically tell you how many commits you are ahead of or behind the repo.

"git.autofetch": true