DCC workshop: Introduction to Git and GitHub - Part 2

In this in-person workshop, we will cover the fundamental concepts and practical skills needed to collaborate effectively with GitHub. You will learn:

• • Branching

    • Creating  and switching branches

    • Working on branches

    • Pushing branches to GitHub

  • Pull Requests & Code Review

    • What is a pull request (PR)?

    • Creating a PR on GitHub

    • Assigning reviewers and adding comments

    • Request changes vs approve in GitHub

  • Merging & Conflict Resolution 

    • Merge strategies (merge commit vs squash).

    • Demonstrate merging a PR after review.

    • Show how to resolve the conflict in VS Code (or terminal).

  • Collaboration Best Practices 

    • Keeping main clean and stable.

    • Use of feature branches.

    • Small, meaningful commits.

    • Writing good commit messages and PR descriptions.

  Prerequisite for Participants:

  • Experience with the topics covered in Introduction to Git and GitHub - Part 1
  • Git is installed and configured.
  • GitHub account
  • VS Code or terminal access.