Hi, I'm trying to update ffdiaporama to 1.3.1 (a bug fixing release) and after using git-import-orig, I got a lot of merge conflicts on files that hasn't been changed.
I checked the upstream/1.3 tag (the previous version) in gitk, but as I couldn't find it anywhere, I tried to create if: 'fatal: tag 'upstream/1.3' already exists'. So I deleted the upstream/1.3 tag and recreated it in the right place (before merging 1.3), and voila: no more merge conflicts. BUT, I'm not able to puch back my changes, because of a non-fast-forward update... This happens also if I only change the upstream tag to the correct commit, so I'm blocked... What can I do? Thanks in advance, Fabrice _______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
