From: Sean Whitton Date: Thu, 19 Apr 2018 00:06:20 +0000 (-0700) Subject: dgit-maint-debrebase(7): notes about d/patches X-Git-Tag: archive/debian/5.0~6^2~12 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ce81728bbbad2adfd4fbdd32467acec87eca5b3d;p=dgit.git dgit-maint-debrebase(7): notes about d/patches Signed-off-by: Sean Whitton --- diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 601b8e92..c615ce2e 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -476,6 +476,10 @@ If that fails, because your branch and the NMUers work represent divergent branches of development, you have a number of options. Here we describe the two simplest. +Note that you should not try to resolve the divergent branches by +editing files in I. Changes there would either cause +trouble, or be overwritten by git-debrebase(1). + =head2 Rebasing your work onto the NMU =over 4 @@ -517,6 +521,13 @@ upstream source to the required state. You can push and pull to and from B during this. Just before uploading, you debrebase, once, to tidy everything up. +=head2 The debian/patches directory + +In this workflow, I is purely an output of +git-debrebase(1). You should not make changes there. They will +either cause trouble, or be ignored and overwritten by +git-debrebase(1). + =head2 Upstream branches Except in the case where upstream releases only tarballs, we do not