GDC 2024 is part of the Informa Tech Division of Informa PLC

This site is operated by a business or businesses owned by Informa PLC and all copyright resides with them. Informa PLC's registered office is 5 Howick Place, London SW1P 1WG. Registered in England and Wales. Number 8860726.

View, browse and sort the ever-growing list of sessions by day, time, pass type, topic, and format. With this Session Viewer, you can view session and speaker details for Game Developers Conference 2024.

You will be able to build your schedule with the GDC Mobile App. The GDC 2024 app will be available for download in Apple Apps and Google Play late February 2024.

Sessions do fill up and seating is first come, first serve, so arrive early to sessions that you would like to attend. Adding a session to your schedule does not guarantee you a seat.

MergeBot: Activision's Merge and Resolve Infrastructure

Damianos Gkouzkouris  (Senior Tools Engineer, Activision)

Location: Room 2016, West Hall

Date: Thursday, March 21

Time: 3:00 pm - 3:30 pm

Pass Type: All Access Pass, Core Pass - Get your pass now!

Topic: Programming

Format: Session

Vault Recording: Video

Audience Level: All

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.


The main takeaway from this talk is the importance of implementing and efficiently maintaining a successful merging automation system. The in-depth analysis of techniques for scheduling, running, resolving, and notifying for integrations provides attendees with the tools to establish a robust implementation of such a system.

Intended Audience

This talk is most useful for integration engineers who work on merges across Perforce branches and other source control tools. Automation engineers can also benefit from the interconnected merge system design. Additionally, anyone working with Perforce can gain a good understanding of how to simplify their integration pipeline.

Connecting the Global Game Development Community

GDC Vault icon
Game Developers Choice Awards icon
Independent Games Festival (IGF) icon icon