Branching Exercises#

Interactive exercises to master Git branching and merging operations.

Learning Objectives#

• Practice creating and managing multiple branches
• Learn to handle merging scenarios including conflicts
• Implement common branching strategies
• Master branch navigation and history visualization

Practice Overview#

These exercises will help you master Git branching through practical scenarios. You'll work with multiple branches, handle merges, and resolve conflicts - all common tasks in real-world development.

Exercise 1: Feature Branch Workflow#

Scenario#

You're working on a website project. Create feature branches to implement a navigation menu and a contact form, then merge them into the main branch.

Steps:#

            - Create and switch to a branch for the navigation feature
            - Make changes and commit them
            - Create another branch for the contact form
            - Make and commit changes on the contact form branch
            - Merge both features into the main branch

Solution:#

Exercise 2: Resolving Merge Conflicts#

Scenario#

Two team members have made different changes to the same file. Practice resolving the resulting merge conflict.

Setup:#

           README.md

$ git add README.md $ git commit -m "Initial README"

Create feature branch#

$ git checkout -b feature/readme-update $ echo "# Project Title\nWelcome to our awesome project!" > README.md $ git commit -am "Update README welcome message"

Switch back and modify main#

$ git checkout main $ echo "# Project Title\nWelcome to our professional site." > README.md $ git commit -am "Update README messaging"`} />

Resolve Conflict:#

Conflict Resolution Example:#

            >>>>>> feature/readme-update

Resolved version:#

Project Title#

Welcome to our awesome professional site!`} />

Exercise 3: Branch Management#

Scenario#

Practice branch management tasks including renaming, deleting, and listing branches. Also learn to visualize branch history.

Tasks:#

            - List all branches and their latest commits
            - Rename a branch
            - Delete merged branches
            - Visualize branch history

Commands:#

Exercise 4: Advanced Branching Patterns#

Scenario#

Implement a feature-development-release branch pattern common in larger projects.

Implementation:#

Branching Best Practices#

          - Always create branches for new features or fixes, no matter how small
          - Use descriptive branch names that reflect their purpose
          - Regularly sync your feature branches with their base branch to avoid major
              conflicts
          - Delete branches after they're merged to keep your repository clean