From 4dee8fc11bf648b13019dcdcf13d02c0d0e26a40 Mon Sep 17 00:00:00 2001 From: Yuhang Zhu Date: Fri, 31 Aug 2018 16:51:53 -0700 Subject: [PATCH] Update policy-csp-controlpolicyconflict.md Please review the change and let me know whether I need to make further change. Before publish the change, please ping me first. Thanks. -Yuhang Zhu --- .../mdm/policy-csp-controlpolicyconflict.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md index 1295ab27a3..0f0c2a8172 100644 --- a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md +++ b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md @@ -68,7 +68,10 @@ Added in Windows 10, version 1803. This policy allows the IT admin to control wh > MDMWinsOverGP only applies to policies in Policy CSP. It does not apply to other MDM settings with equivalent GP settings that are defined on other configuration service providers. This policy is used to ensure that MDM policy wins over GP when same setting is set by both GP and MDM channel. The default value is 0. The MDM policies in Policy CSP will behave as described if this policy value is set 1. -Note: This policy doesn’t support Delete command. This policy doesn’t support setting the value to be 0 again after it was previously set 1. In Windows 10, next major version, Delete command and setting the value to be 0 again if it was previously set to 1 will be supported. + +Note 1: This policy doesn’t support Delete command. This policy doesn’t support setting the value to be 0 again after it was previously set 1. + +Note 2: This policy is subject to be deprecated in the future release with a better conflict handling solution. The following list shows the supported values: