Study StudioCertificatesDashboardSign inSign in

← All projects

beginner3h

Git Branching & Collaboration Workflow

Practice the branch → commit → pull request workflow professional teams use, on a small shared-style project.

Tracks: Git, APIs & SQL

Open in Project Studio

Objectives

Create and switch between branches
Make atomic, well-described commits
Resolve a merge conflict
Describe a typical GitHub pull-request workflow

Before you start

Milestones

0%

1. Branch and commit

Create a feature branch and commit incremental changes.

A new branch created off main
At least three commits with clear messages
No unrelated changes bundled into a single commit

2. Merge conflict resolution

Simulate and resolve a conflict between two branches.

Two branches edit the same lines of a file
The conflict markers are resolved correctly
The merged file makes logical sense

3. Pull request narrative

Write a pull request description for the change.

Summarizes what changed and why
Lists how the change was tested
Notes any follow-up work

References

GitHub Docs: About pull requests