Hi, Vasudev Kamath wrote (15 Oct 2012 03:43:55 GMT) : >> * git checkout master && git merge -s ours squeeze
> Well I don't really think I can merge it back to master! I think you should read the documentation about "-s ours", before concluding you can't merge it back to master. > Well unfortunately that repository no more exists! I don't know what > happened but I guess either domain moved or something else happened. Have you tried asking the previous maintainer to provide you with their old repository's history? Cheers, -- intrigeri | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/85y5j7d5na....@boum.org
