From Code to Performance

Exercise 3: Advanced Git & Github Collaboration

Objectives:Practice real-world Collaboration, branch strategy, and pull-request workflows.

Tasks

  1. Create a team repo on Github (invite one collaborator).
  1. Feature Branch Workflow
    • Each member clones the repo and creates a branch (e.g., feature-login and feature-style
    • Add or edit files independently.
  1. Pull Request & Reviews
    • Open a Pull Request (PR) for each branch./li>
    • Request review from your teammate.
    • Add comments or change requests.
  1. Merge & Conflicts Resolution
    • Introduce a deliberate conflict by editing the same line in a shared file.
    • Resolve conflicts locally and push the fixed merge.
  1. Use Github Issues to document one bug or enhancement and link it to a PR.

Commands to Practice

git clone, git fetch, git rebase, git diff, git merge, git push, gh pr check