Package: git-debrebase Version: 12.11 Dear maintainer,
% debcheckout helm % cd helm % git log -1 --oneline % # d4f5bfcf (HEAD -> master, origin/master) Merge from sid [dgit] % git debrebase --8<---------------cut here---------------start------------->8--- OK, you are ahead of refs/remotes/origin/master OK, you are ahead of refs/remotes/dgit/dgit/sid Found a general merge, will try to tidy it up. Running merge resolution for d4f5bfcf321ccf7a3938cd2d81ce4f8764b882d1... The following paths are ignored by one of your .gitignore files: debian/patches hint: Use -f if you really want to add them. hint: Disable this message with "git config set advice.addIgnoredFile false" git-debrebase: git-debrebase: error: subprocess failed with error exit status 1 --8<---------------cut here---------------end--------------->8--- It seems like this should succeed. -- Sean Whitton
