Skip to content

fix repeated conflict detection and introduce optional resolver timeout - #3085

Merged
forki merged 1 commit into
masterfrom
resolve-timeout
Feb 27, 2018
Merged

forki merged 1 commit into
masterfrom
resolve-timeout

fix repeated conflict detection and introduce optional resolver timeout

3fc2ff4
Select commit
Loading
Failed to load commit list.

Workflow runs completed with no jobs