[Pkg-samba-maint] [samba] 01/06: README.source: Default merge-mode of gbp has changed to replace

[Mathieu Parent]

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

sathieu pushed a commit to branch master
in repository samba.

commit e511bd2e5e1efa16027cc5884a933c66d0aae4e4
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue Aug 15 21:50:40 2017 +0200

    README.source: Default merge-mode of gbp has changed to replace
---
 debian/README.source | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/README.source b/debian/README.source
index 0d5a4d7..18f211b 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,7 +25,8 @@ git checkout master
 # Import latest version
 gbp import-orig --uscan \
   -u "${upstream_version}+dfsg" \
-  --upstream-vcs-tag "samba-${upstream_version}"
+  --upstream-vcs-tag "samba-${upstream_version}" \
+  --merge-mode merge
 # all done :)
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git