การแตกแขนงสำหรับฟีเจอร์และการแก้ไขเร่งด่วน

When working on new features or major changes, it's best to keep them separate from your main codebase. This is where feature branching comes in!

It allows developers to work on new functionality in isolation without affecting the stable version of the project. This prevents half-finished work from breaking the main branch.

To start a new feature, you'll create a new branch from your main development line, often main or develop. This creates a separate timeline for your work.

Use the git checkout -b command to create a new branch and switch to it in one go.

Once on your feature branch, you can make changes, add files, and commit as usual. Your commits will only exist on this branch, not on main.

It's good practice to push your feature branch to the remote repository regularly, especially if you're collaborating or want a backup.

After your feature is complete, reviewed, and tested, it's time to integrate it back into the main development branch. You'll switch to the target branch (e.g., main) and then merge your feature branch.

Git will combine the changes. Often, a merge commit is created, showing exactly when the feature was integrated.

Once a feature branch has been merged and is no longer needed, it's good practice to delete it. This keeps your list of branches tidy and easier to manage.

Remember to delete both the local and remote versions of the branch.

Sometimes, critical bugs appear in the production environment that need immediate attention. These are called hotfixes.

A hotfix workflow allows you to quickly fix the issue and deploy it, minimizing downtime, without waiting for the next planned feature release.

Unlike feature branches, hotfixes are typically branched directly from the production-ready branch (e.g., main or master). This ensures you're fixing the exact code currently in production.

You create a new branch specifically for the hotfix, often named with a prefix like hotfix/.

On your hotfix branch, you'll apply the necessary changes to resolve the bug. Keep the fix as small and focused as possible to reduce risk.

After making changes, commit them with a clear message and thoroughly test the fix to ensure it solves the problem without introducing new ones.

Once the hotfix is verified, it needs to be merged back into the production branch (e.g., main) and immediately deployed.

Crucially, the hotfix also needs to be merged into your long-running development branch (e.g., develop) to prevent the bug from reappearing in future releases.

You've learned about feature branching and hotfixes. Let's test your understanding!

In this lesson, you mastered two essential Git branching strategies:

• Feature Branching: Ideal for developing new features in isolation, ensuring a stable main codebase. You learned to create, work on, merge, and delete feature branches.
• Hotfixes: Crucial for quickly addressing critical bugs in production. You saw how to create hotfix branches from production, apply fixes, and merge them back to both production and development lines.

These techniques are vital for managing complex projects and maintaining a smooth development workflow with your team.