Closed nerdoug closed 4 years ago
merge hung with a message saying it was checking to see if the merge had conflicts. aborted after 10 minutes & will retry