On 19:08 Mon 15 Oct , intrigeri wrote: > 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.
Tried that but what here happens is wheezy branch is based on master which doesn't have any 38 related history at all. So merging will overwrite my 39 work. (I tried this) > > > 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? No I didn't take over directly, it was a bit of mess again one more guy wanted to take over but since he didn't had much time I took over from his work. Best Regards -- Vasudev Kamath http://copyninja.info Connect on ~friendica: copyninja@{frndk.de | vasudev.homelinux.net} IRC nick: copyninja | vasudev {irc.oftc.net | irc.freenode.net} GPG Key: C517 C25D E408 759D 98A4 C96B 6C8F 74AE 8770 0B7E
signature.asc
Description: Digital signature
