Git Workshop

SFU Software Systems Student Society (SSSS) Git Workshop, lead by Dr. Brian. It helped students get basic experience with Git and GitLab.

• For more info on SSSS, see SSSS Facebook, SSSS Instagram or SSSS twitter.

Notes

• Git Workshop Slides
• Video resources for Git with IntelliJ or Android Studio
  • Git in Android Studio: Creating a GitLab repo, SSH key, and initial push of code.
  • Clone Git repo in Android Studio: Cloning an existing Git (or GitLab) repo via Android Studio.
  • Git Merge Conflicts in Android Studio: Resolving merge conflicts.
  • GitLab workflow with Merge Request: Creating an issue, feature branch, switching branches, commit/push, merge request.
  • GitLab workflow with Conflicting Changes: Resolving conflicting changes before submitting a merge request in Android Studio with GitLab.

Previous Git Workshop Audio/Slides Recording

• Jan 2020 Workshop recording of session (fast forward to about minute 38 for start; audio comes in later).