When developers collaborate, they often run into conflicts. Crystal runs in the background and informs developers whenever developers' changes conflict. Crystal can detect textual, build, and testing conflicts. (See the Crystal user manual.)
Crystal is designed and developed by Yuriy Brun, Haochen Wei, Reid Holmes, Michael D. Ernst, and David Notkin.
Email us with any questions.
Click here to watch the presentation describing Crystal and its underlying technique (presented at ESEC/FSE 2011).
This work is supported by Microsoft Research through the Software Engineering Innovation Foundation grant, by the National Science Foundation under Grant# 0963757 and Grant #0937060 to the Computing Research Association for the CIFellows Project, by the National Science and Engineering Research Council Postdoctoral Fellowship, and by IBM through a John Backus Award.