Back to Study Plans

Branch & Collaboration Basics

Beginner-Intermediate

Master the essential workflows for working with branches and teams. Learn feature branch workflow, conflict resolution, and .gitignore management - the foundation of team collaboration.

3-4 hours•5 problems
Your Progress0/5 (0%)

Learning Path

1
#scenario-3-1

Branch Management Essentials

🎯Mixed

Master creating, switching, renaming, and deleting branches - the most frequent Git operations in daily development.

EasyBranching & Collaboration5 Questionsbranchingmanagement+1 more
2
#scenario-3-2

Feature Branch Workflow

💻Terminal

The standard workflow for developing a new feature is to create a dedicated branch. This keeps the 'main' branch clean and allows for code reviews before merging.

MediumBranching & Collaborationbranchingworkflow+1 more
3
#scenario-2-5

Managing .gitignore Patterns

🎯Mixed

Learn to properly configure .gitignore to exclude files you don't want to track, and how to handle files that were accidentally committed.

MediumDaily Operations4 Questionsgitignoreconfiguration+1 more
4
#scenario-3-5

Resolving Merge Conflicts

💻Terminal

You've been working on a feature, and in the meantime, someone else changed the same line of code on the 'main' branch. It's time to merge, and you need to resolve the conflict.

MediumBranching & Collaborationconflictsmerging+1 more
5
#scenario-4-1

Fork Workflow and Creating Pull Requests

🎯Mixed

You want to contribute to an open-source project. Learn the fork workflow: create your own copy, make changes, and submit a pull request.

MediumPull Requests & Code Review4 Questionsforkpull-request+2 more