On Thu, Dec 01, 2016 at 04:36:09PM +0100, Andreas Tille wrote:
> I tried to apply your hint to ncbi-tools6[1] but this does not change
> anything:
> ncbi-tools6(master) $ LC_ALL=C git merge upstream/6.1.20120620
> Already up-to-date.
> Did I missinterpreted your hint?
No, but you could check that it doesn't apply there, as there the upstream
tag is merged into master. There is another problem there: master has some
upstream files changed, see git diff upstream/6.1.20120620..master.


Attachment: signature.asc
Description: PGP signature

Reply via email to