Git Branching and Merging

Home / Topic / Git Branching and Merging

1Introduction to Git 2Initial Setup and Basic Workflow 3Basic Concepts of Branches in Git 4Creating and Deleting Branches 5Branch Navigation 6Branch Merging 7Resolución de Conflictos de Fusión 8Merge Strategies: Fast-Forward vs. Recursive 9Rebase in Git: Concepts and Uses 10Merge vs. Rebase: When to Use Each 11Remote Branches and Their Management 12Git Flow and Other Workflow Models 13Best Practices for Branching and Merging 14Advanced Tools and Commands 15Conclusion and Final Recommendations

Start course

Support Chuck’s Academy!

Enjoying this course? I put a lot of effort into making programming education free and accessible. If you found this helpful, consider buying me a coffee to support future lessons. Every contribution helps keep this academy running! ☕🚀

You can also deepen in the following topics:

Interactive Rebase in Git
Conflict Resolution in Git

Ask me anything