[med-svn] r20166 - trunk/community/website/docs

[Afif Elghraoui]

Author: afif-guest
Date: 2015-09-30 09:34:13 +0000 (Wed, 30 Sep 2015)
New Revision: 20166

Modified:
   trunk/community/website/docs/policy.xml
Log:
Describe how to avoid changelog merge conflicts when backporting



Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml	2015-09-30 07:16:37 UTC (rev 20165)
+++ trunk/community/website/docs/policy.xml	2015-09-30 09:34:13 UTC (rev 20166)
@@ -630,14 +630,15 @@
 			</para>
 			<para>
 			  When preparing subsequent versions of a backport, the changelog should
-			  include all the changes since the previous backported version:
+			  include all the changes since the previous backported version. You will want to make sure you set up
+			  your cloned repository to use <literal>dpkg-mergechangelogs</literal> (from the <literal>dpkg-dev</literal>
+			  package) to avoid getting unnecessary merge conflicts. See its manpage section "Integration with Git" for
+			  how to set that up.
 			  <programlisting>
 			    <command>git checkout debian/jessie-backports</command>
 			    <command>git merge debian/unstable</command> (or <literal>master</literal>)
 			  </programlisting>
-			  You will get a merge conflict on the changelog. When resolving the conflict,
-			  keep the entry from the previous backport(s) as well as the subsequent
-			  changelog entries from the uploads to Unstable.
+			  Now, you can try building against a Stable chroot.
 			</para>
 		</sect2>
 		<sect2 id="ppa">