Instructor Notes

This is a placeholder file. Please add content here.

Setup Instructions


Introduction to Git & GitLab


Instructor Note

When the workshop begins, you should be sharing your screen, and instruct the learners to make sure their setup looks like yours:

  1. A new VS Code window is open (taking up the left 75% of the screen)
  2. A browser window with https://code.ornl.gov is open (taking up the right 75% of the screen)

Instruct learners to sign in to GitLab if they have not already.

In your browser window, you can have a second tab open with all images for this workshop, available at this URL



Create a GitLab Repository


Instructor Note

When the workshop begins, you should be sharing your screen, and instruct the learners to make sure their setup looks like yours:

  1. A new VS Code window is open (taking up the left 75% of the screen)
  2. A browser window with https://code.ornl.gov is open (taking up the right 75% of the screen)

In your browser window, you can have a second tab open with all images for this workshop, available at this URL



Instructor Note

The documentation for creating a new repo on GitLab is available here

If you have taught this lesson before, make sure that you have deleted your existing multiverse repo. The documentation for deleting a repo on GitLab is available here



Setup Git Configs


Instructor Note

On MacOS, without any configuration your output might look like this:

OUTPUT

credential.helper=osxkeychain

On Windows, without any configuration your output might look like this:

OUTPUT

diff.astextplain.textconv=astextplain
filter.lfs.clean=git-lfs clean -- %f
filter.lfs.smudge=git-lfs smudge -- %f
filter.lfs.process=git-lfs filter-process
filter.lfs.required=true
http.sslbackend=openssl
http.sslcainfo=C:/Program Files/Git/mingw64/ssl/certs/ca-bundle.crt
core.autocrlf=true
core.fscache=true
core.symlinks=false
pull.rebase=false
credential.helper=manager-core
credential.https://dev.azure.com.usehttppath=true
init.defaultbranch=main

If you have different output, then you may have your Git configured already. If you have not configured Git, we will do that together now.



Tracking Changes


Pushing changes to GitLab


Branches


Merge Requests


[Optional] Resolving Conflicts