Operations | Monitoring | ITSM | DevOps | Cloud

AI-assisted merge conflict resolution is changing how developers handle Git workflows. Watch GitKraken Ambassador Kevin Bost demonstrate AI-powered features that eliminate merge conflict dread, clean up messy commit history, and generate contextual commit messages in seconds.

GitKraken CTO Eric Amodio breaks down the Model Context Protocol (MCP) and explains why Git intelligence is critical for AI agents at GitKon 2025. In this session, Eric covers: What MCP is and why every major AI company adopted it Why AI needs Git history, not just file system access How GitKraken MCP removes Git pain safely The future of agentic developer workflows How Commit Composer uses AI to organize commits without losing data.

Git is full of underused powers that most developers never discover. In this GitKon 2025 session, GitKraken Senior Product Manager Jonathan Silva reveals 6 lesser-known Git commands that solve real workflow pain points, from recovering lost commits to managing stashes strategically. Learn how to undo commits without losing work, recover deleted branches with git reflog, cherry-pick without immediate commits, target specific stashes, see contributor breakdowns, and more. Jonathan also demonstrates how GitKraken Desktop makes these workflows visual and intuitive.

GitKraken's Product Director Justin Roberts explains why we're focused on managing AI-generated code aftermath, not creating another code generator. Learn about Commit Composer, AI conflict resolution, GitKraken MCP, and our agent-driven workflow vision.

Developer productivity metrics create unique anxiety. If your company rolled out tracking systems like DORA metrics or velocity dashboards, you're probably wondering what these numbers mean and how they'll evaluate your work. At GitKon 2025, we assembled senior engineers from GitHub, Cloudflare, Kong, and GitKraken to discuss "Your Boss is Measuring You, Now What?" The panel included both individual contributors and engineering leaders, creating an honest conversation about measurement from both perspectives.

Context engineering isn't just an AI buzzword. It's how high-performing dev teams are transforming productivity at scale.

Learn code review best practices from experienced developer Shashi Lo at GitKon 2025. Discover how to review pull requests effectively, give constructive feedback using the nit vs. non-nit framework, and leverage AI tools like CodeRabbit and GitHub Copilot to catch bugs humans miss. Shashi Lo shares 20+ years of code review philosophy, demonstrating real PR reviews on his Secret Santa app and showing exactly what makes thorough code review essential for shipping production-ready code.