Am Montag, den 19.05.2014, 16:28 +0530 schrieb Vasudev Kamath: > Do you see any other methods? I am no GIT expert at all, but maybe "git rm" the conflicting files before attempting to import the new source package will help? - Fabian