← Back to home

Screenshots

Spoilers ahead. The screenshots show the finished solution of the hack session.

A simple working graphics pipeline
Screenshot 1: A simple pipeline
A simple conflict between two edits
Screenshot 2: A simple conflict
Two windows with divergent changes
Screenshot 3: Divergent changes
Conflict visualization and conflict-tolerant computation
Screenshot 4: Conflict visualization & conflict-tolerant computation
The conflict resolved
Screenshot 5: Resolution