This repository contains the MegaCorp project, part of the Boot.dev course on Git. This project focuses on exploring and practicing Git commands, workflows, and collaboration strategies in a simulated corporate environment.
- Git Basics: Practice essential commands like
clone,commit,push, andpull. - Branching and Merging: Work with branches to manage parallel development workflows.
- Conflict Resolution: Learn strategies to resolve merge conflicts effectively.
- Rebase and Squash: Optimize commit history for cleaner and more readable logs.
- Simulated Team Collaboration: Work with multiple branches and contributors.
- Git: Version control for source code management.
- Command Line: Execute Git commands via terminal.
- GitHub: Host and collaborate on repositories.
- Managing feature branches and merging them into the main branch.
- Resolving merge conflicts during collaboration.
- Using
rebaseto keep a clean commit history. - Leveraging GitHub features like pull requests and branch protection rules.
This project mainly involved testing and practicing Git workflows. Key practices included:
- Experimenting with branch creation and deletion.
- Simulating collaborative workflows to encounter and resolve merge conflicts.
- Practicing rewriting commit history with
rebaseandamend.
The MegaCorp project is designed to solidify Git skills, including:
- Navigating and resolving real-world Git challenges.
- Understanding how to maintain clean and readable commit histories.
- Learning best practices for collaborative software development.
├── branches/ # Practicing branch workflows
├── merge-conflicts/ # Merge conflict scenarios
├── rebase/ # Rebase and squash tasks
└── README.md # Project documentation
Feel free to explore this repository and test out different Git workflows! 🏢