Colloquium 2024 Git Part 3: Managing Workflows

This session explores strategies and tools that enhance collaboration, improve workflow efficiency, and streamline code management. Building on foundational Git concepts presented in parts 1 & 2, we'll explore branching strategies, focusing on how they shape team collaboration and project stability. We'll cover essential commands for rebasing, merging, and resolving conflicts, providing insights into when and why each method works best. Additionally, we'll look at interactive rebase for rewriting commit history, leveraging Git tags for versioning, and working with stashes to manage changes across different contexts. This deeper dive will enable users to maintain cleaner commit histories, manage complex workflows, and handle more advanced project requirements.