[cpp-log4shib] 01/11: Use the 'replace' merge mode

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to annotated tag debian/2.0.0-1
in repository cpp-log4shib.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=338086af498bc1cefb0c15381161e146f7e9b2f5

commit 338086af498bc1cefb0c15381161e146f7e9b2f5
Author: Ferenc Wágner <wferi at debian.org>
AuthorDate: Sun Jul 29 21:29:20 2018 +0200

    Use the 'replace' merge mode
    
    This avoids conflicts as upstream is removing its debian directory.
    Unrelated change: the pristine-tar option is generic.
---
 debian/gbp.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 602e358..36e6e2e 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,9 +1,10 @@
 [DEFAULT]
 debian-branch = debian/master
 upstream-branch = upstream/latest
+pristine-tar = True
 
 [import-orig]
-pristine-tar = True
+merge-mode = replace
 
 [dch]
 multimaint-merge = True

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.