You've been logged out of GDC Vault since the maximum users allowed for this account has been reached. To access Members Only content on GDC Vault, please log out of GDC Vault from the computer which last accessed this account.

Click here to find out about GDC Vault Membership options for more users.


The Number One Educational Resource for the Game Industry

Session Name:

MergeBot: Activision's Merge and Resolve Infrastructure


Source control is one of the foundational elements in a software's lifecycle. Unfortunately, code merges and conflict resolution can be challenging, especially in a game development environment with numerous large files scattered across branches that must be kept in sync. This talk serves as a postmortem on a tool that emerged from our ongoing work to smoothly integrate Perforce changelists between streams, all while ensuring it doesn't disrupt our continuous development pipeline. The presentation will delve into the architecture of the tool, the challenges encountered while making it as hands-off as possible, the complexities involved in the file resolution process, which needed to be universally accessible, and a discussion of the compromises we had to make while developing and customizing the tool to suit our needs.

Did you know free users get access to 30% of content from the last 2 years?

Get your team full access to the most up to date GDC content

  • Game Developers Conference 2024
  • Damianos Gkouzkouris
  • Activision
  • free content
  • Programming
  • Programming