Module 3: Git & Collaborative Workflows
- Create commits, branches, and pull requests
- Resolve a merge conflict
- Follow a clear, descriptive commit message convention
On any real engineering team, you rarely write code directly on the main branch. Instead, you create a separate branch for your change, commit your work in small, logical steps with clear messages, and open a pull request (PR) asking teammates to review it before it merges into main. You will learn to resolve a merge conflict, which happens when two branches change the same lines of a file and Git cannot automatically decide which version to keep, by manually choosing or combining the changes. You will also practice writing commit messages that explain why a change was made, not just what changed, since "why" is the information that is hardest to recover later.
1. A merge conflict occurs when:
2. A pull request (PR) is primarily used to:
3. A good commit message should primarily communicate: