diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -118,9 +118,6 @@
           'many Arcanist/Phabricator features which depend on having access '.
           'to the working copy.'),
         'conflicts' => array(
-          'apply-patches'       => pht('%s disables lint.', '--raw'),
-          'never-apply-patches' => pht('%s disables lint.', '--raw'),
-
           'create'              => pht(
             '%s and %s both need stdin. Use %s.',
             '--raw',
@@ -140,10 +137,6 @@
           'Generate diff by executing a specified command, not from the '.
           'working copy. This disables many Arcanist/Phabricator features '.
           'which depend on having access to the working copy.'),
-        'conflicts' => array(
-          'apply-patches'       => pht('%s disables lint.', '--raw-command'),
-          'never-apply-patches' => pht('%s disables lint.', '--raw-command'),
-        ),
       ),
       'create' => array(
         'help' => pht('Always create a new revision.'),
@@ -183,10 +176,6 @@
       ),
       'nolint' => array(
         'help' => pht('Do not run lint.'),
-        'conflicts' => array(
-          'apply-patches' => pht('%s suppresses lint.', '--nolint'),
-          'never-apply-patches' => pht('%s suppresses lint.', '--nolint'),
-        ),
       ),
       'only' => array(
         'help' => pht(
@@ -200,26 +189,6 @@
       'allow-untracked' => array(
         'help' => pht('Skip checks for untracked files in the working copy.'),
       ),
-      'apply-patches' => array(
-        'help' => pht(
-          'Apply patches suggested by lint to the working copy without '.
-          'prompting.'),
-        'conflicts' => array(
-          'never-apply-patches' => true,
-        ),
-        'passthru' => array(
-          'lint' => true,
-        ),
-      ),
-      'never-apply-patches' => array(
-        'help' => pht('Never apply patches suggested by lint.'),
-        'conflicts' => array(
-          'apply-patches' => true,
-        ),
-        'passthru' => array(
-          'lint' => true,
-        ),
-      ),
       'amend-all' => array(
         'help' => pht(
           'When linting git repositories, amend HEAD with all patches '.