Hell andreas, I have this kind of problem with git import-orig when I forgot to synchronize the upstream branch with the origin/upstream branch
this way the merge is done between master and your local upstream branch which is not the origin upstream branch. cheers Frederic -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/a2a20ec3b8560d408356cac2fc148e53b1ff1...@sun-dag3.synchrotron-soleil.fr
