Package: dgit Version: 0.15 Severity: minor dgit: dgit push: HEAD is not a descendant of the archive's version. dgit: To overwrite it, use git-merge -s ours refs/remotes/dgit/dgit/sid.
Very helpful! But, git-merge has not been in PATH for some time now. It should say git merge instead. -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.10-3-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages dgit depends on: ii devscripts 2.13.4 ii dpkg-dev 1.17.1 ii git [git-core] 1:1.8.4~rc3-1 ii libdpkg-perl 1.17.1 ii libwww-perl 6.05-1 ii perl [libdigest-sha-perl] 5.18.1-4 ii realpath 1.18 Versions of packages dgit recommends: ii openssh-client [ssh-client] 1:6.2p2-6 Versions of packages dgit suggests: pn sbuild <none> -- no debconf information -- see shy jo
signature.asc
Description: Digital signature