First it looked like some issue with merging git commits to main diaspora but its possible to pull those changes into working git copy (if you have one :) ) But finally the person who successfully merged the changes had to comment out the changes because identi.ca changes where conflicting with twitter and it was sending updates to all twitter account present on that Diaspora pod :D This is a major security bug so it need be fixed :) On Tue, Jan 25, 2011 at 9:44 AM, Praveen A <pravi.a@xxxxxxxxx> wrote: > Hi, > > Someone please volunteer to study this request and explain the process > and demo the same. This is 'real git power'. Looks like this is not > working properly, more points to those who fix the fix :) > > https://github.com/diaspora/diaspora/pull/577 > > Praveen > -- > പ്രവീണ് അരിമ്പ്രത്തൊടിയില് > You have to keep reminding your government that you don't get your > rights from them; you give them permission to rule, only so long as > they follow the rules: laws and constitution. > > -- Vasudev Kamath http://vasudevkamath.blogspot.com http://identi.ca/vasudev http://twitter.com/vasudevkamath