Skip to content

Always enable hooks and use of quarantine dirs in ResolveConflicts

Patrick Steinhardt requested to merge pks-ff-resolve-conflicts-remove into master

This MR removes two feature flags in ResolveConflicts. Both changes have been tested in production without any issues.

Closes #3723 (closed)

Merge request reports