[med-svn] [bedtools] 01/01: Further hints

[Andreas Tille]

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

tille pushed a commit to branch debian/unstable
in repository bedtools.

commit 4169a2d41e8f13fb0c6a45dad22a3787c7d4e594
Author: Andreas Tille <andreas at sputnik.fam-tille.de>
Date:   Tue Jul 7 13:38:04 2015 +0200

    Further hints
---
 debian/README.source | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/README.source b/debian/README.source
index 78c5cef..4870398 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,9 +3,12 @@ workflow it is documented here, how the package can be updated:
 
   1. in the master branch, pull the upstream master branch and its tags.
 
+       checkout master
        git pull https://github.com/arq5x/bedtools2 --tags
 
-      FIXME: If this leads to lot of merge conflicts, do what?
+     Remark: If this pull fails with a lot of stuff to merge you might
+     have some ~/.gitconfig that breaks the pull above.  Please try to
+     deactivate it for the moment.
 
   2. download the upstream tarball
 

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