On 09/03/16 11:46, Ander Conselvan de Oliveira wrote:
Patches that move big chunks of code between files can cause some complicated conflicts. Add a note to coordinate with maintainers before merging such patches.Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.olive...@intel.com> --- drm-intel.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drm-intel.rst b/drm-intel.rst index c0c2f20..89df24b 100644 --- a/drm-intel.rst +++ b/drm-intel.rst @@ -350,6 +350,10 @@ An inexhaustive list of details to check: http://developercertificate.org/. dim apply-branch should do this automatically for you. +* For patches that move around lots of code (file rename or extraction) please + coordinate with maintainers to avoid unnecessary pain with conflicts. Usually + some explicit merges are needed to avoid git getting lost. + On Confidence, Complexity, and Transparency -------------------------------------------
Perhaps also add a note about "git blame -C", as recently discussed here by Tvrtko & Arun in the thread "[PATCH 044/190] drm/i915: Move GEM request routines to i915_gem_request.c"?
.Dave. _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
