Always enable hooks and use of quarantine dirs in ResolveConflicts
This MR removes two feature flags in ResolveConflicts. Both changes have been tested in production without any issues.
Closes #3723 (closed)
This MR removes two feature flags in ResolveConflicts. Both changes have been tested in production without any issues.
Closes #3723 (closed)