[Intel-gfx] [DIM DOCS PATCH 2/2] doc: clarify what type of changes are acceptable at commit time
Jani Nikula
jani.nikula at intel.com
Wed Jun 27 15:13:01 UTC 2018
As a rule of thumb, don't change patches while committing.
Cc: Imre Deak <imre.deak at intel.com>
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
drm-intel.rst | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drm-intel.rst b/drm-intel.rst
index baf48f459dd9..ad8ff9739336 100644
--- a/drm-intel.rst
+++ b/drm-intel.rst
@@ -196,6 +196,13 @@ An inexhaustive list of details to check:
coordinate with maintainers to avoid unnecessary pain with conflicts. Usually
some explicit merges are needed to avoid git getting lost.
+* As a general rule, do not modify the patches while applying, apart from the
+ commit message. If the patch conflicts, or needs to be changed due to review,
+ have the author rebase, update and resend. Any change at this stage is a
+ potential issue bypassing CI.
+
+ At most, minor comment and whitespace tweaks are acceptable.
+
On Confidence, Complexity, and Transparency
-------------------------------------------
--
2.11.0
More information about the Intel-gfx
mailing list