To use PolyGerrit, please enable JavaScript in your browser settings, and then refresh this page. JCBC-1860, SCBC-315: Add "Custom" ConflictResolution to bucket settings. (167029) ยท Gerrit Code Review