You got the best approach, fork 2.0, make sure you are on branch 2.0 by doing "git branch" on your forked code. If its on master switch to 2.0 by "git checkout 2.0". then put your changes, commit then send a pull request.
Added you on list of contacts on skype let me add you to the dev chat.



On Nov 3, 2010 1:45 PM, "Milo van der Linden" <milo@...> wrote:
> Thank you Linda for the response. I will read through git documentation to
> find out how to create my own repo and send pull requests! I also added you
> to my skype contacts.
>
> What is the best approach to develop:
>
> 1. fork the ushahidi-web
> 2. work on the fork
> 3. commit
> 4. send out a pull request?
>
> Or is the workflow different? I want to make sure I take the right approach
>
> 2010/11/3 Linda Kamau <linda@...>
>
>> Hi Milo van der Linden,
>> Great fixes you have there, much appreciated. The best branch to work with
>> would be 2.0. Also you can create a repo for your code/changes then send
>> pull requests to the ushahidi team, that way evaluation becomes easy.
>> Due to the structure changes on skype, it is not possible for people to
>> join a public chat but you can add me on your list of contacts and than I
>> can invite you to the Ushahidi dev chat where you will meet other deveopers
>> and be able to share ideas and code.
>> My skype id is lindakamau and once aain thank you for our contribution.
>>
>>
>> On Wed, Nov 3, 2010 at 10:55 AM, Milo van der Linden <milo@...>wrote:
>>
>>> Hello list!
>>>
>>> I am an Open Source Geospatial Consultant, involved in OSGeo and
>>> OpenStreetMap (among others). I am good at OpenLayers, Postgres/PostGIS,
>>> geoserver and javascript (preferably jQuery) and PHP.
>>>
>>> I have testdriven Ushahidi and already have some stuff ready that I would
>>> like to share:
>>> - Dutch translation, 80% ready
>>> - Fixes for the issues: #1173, #1174, #1177 (needs discussion first) and
>>> #1178
>>> - I made the main.php and several other pages w3c valid
>>> - I am currently working at solving issues #1169 and #1170
>>> - I have some ideas on letting admins add wms layers
>>> - I want to enhance the geonames.org geocoding process by parsing rss
>>> first to detect already geocoded feed-items and then only parsing the not
>>> geocoded items through geonames
>>> - I am also in another project for open source heatmaps. I read that this
>>> is still a wish, I would be glad to help!
>>>
>>> Now, I simply did a git clone and started working in the downloaded
>>> environment. I myself am a long time SVN user and I am having difficulty
>>> understanding how to create a patch in git. Because I would prefer to set up
>>> a patch that can be tested by your team before ever being granted commit
>>> rights. This procedure is often used in open source communities to determine
>>> the validity of patches before granting new developers full rights on a
>>> repository.
>>>
>>> - Should I work on trunk or on the 2.0 branch?
>>> - What is the best to hand changes,fixes and patches over to the team for
>>> evaluation?
>>> - I have been on the irc-channel, but there was little activity, what
>>> timezone and time of day would be best to enter irc-chat? And if other
>>> channels are more active (f.i. Skype) how can I join them?
>>>
>>> Thank you in advance and I am thrilled by Ushahidi and would love to come
>>> aboard!
>>>
>>> Kind regards,
>>>
>>> Milo van der Linden
>>>
>>
>>
>>
>> --
>> Regards,
>> Linda Kamau
>>
>
>
>
> --
> Milo van der Linden
> Open Source Geospatial consultant
>
> dogodigi - Geospatial solutions
> Beukenlaan 2
> 5261LE Vught
> T. +31616598808