Re: Github Fork And Contibutions via Pull Request

Hi Michael,

Am 18.10.2012 um 19:20 schrieb Michael Hast <[email protected]>:

> Thanks Maik:
> 
> Just to clarify: Here is what normally do. After creating the fork and doing a clone, I have the master branch checked out. Now we come across a bug or need to do a feature enhancement.
> 
> 1. Code the change, commit the change and push it to our fork on github (master branch).

Well. master is always weeks to months behind. You should checkout integration first and see if the given bug still occurs there. You should also review outstanding pull requests or issues on github to see if someone else already addressed this.

If not, next choice is what wonder branch to base the changes on. Most people here who contribute to the project work with integration anyway, and for those it's a no-brainer. If you base your production stuff on master and need those changes there before they would make their way through integration and rc into the next master release, you could be better off to base them on master for that purpose, using a new branch based on the latest master release.

You could then create a separate new branch from integration that you'll use to merge your changes in there periodically. That way you can always check compatibility against the newest wonder developments, and you would use that branch to make your pull request, because that needs to be based on integration for easier merge by the core committers. And you would need to be able to test your changes against newest integration before even making the pull request.

Maik


> 2. Tag master branch and push that tag to our fork, and use that tag for our production builds.
> 
> Now I want to make that enhancement available via Pull Request to the community. Now I checkout integration branch and create a branch of it and commit my change to that branch, push it to my fork and create a pull request?
> 
> Michael
> 
> On 10/18/2012 9:50 AM, Maik Musall wrote:
>> Hi Michael,
>> 
>> put everything that belongs together in a new branch that bases on the current integration branch. Each branch can contain several commits, and you can even submit more commits to that branch until the pull request is accepted). You then push that branch to your github fork and create a pull request on that branch against projectwonder/integration on github.
>> 
>> Maik
>> 
>> Am 18.10.2012 um 18:15 schrieb Michael Hast <[email protected]>:
>> 
>>> Hello everyone:
>>> 
>>> I am not sure how to wrap my brain around this, so I ask. My company has
>>> finally created a fork of Wonder on github. We have a few changes to the
>>> Ajax and ERChangeNotificationJMS frameworks. The Ajax framework changes
>>> are to 3 components. And the change to ERChangeNotificationJMS was to
>>> make it work with OpenJMS (authentication and topic had to be added to
>>> the code to make it work).
>>> 
>>> Is there now one pull request per fork or per commit? How does
>>> contributing from our fork work now?
>>> 
>>> Michael
>>> --
>>> Tel: (602) 279-4600 ext: 635
>>> Desert Sky Software: www.desertsky.com
>>>     Specializing in the Development and Hosting of
>>>     e-Business Applications.
>>> 
>>> ------------------------------------------------------------------------------
>>> Everyone hates slow websites. So do we.
>>> Make your web apps faster with AppDynamics
>>> Download AppDynamics Lite for free today:
>>> http://p.sf.net/sfu/appdyn_sfd2d_oct
>>> _______________________________________________
>>> Wonder-disc mailing list
>>> [email protected]
>>> https://lists.sourceforge.net/lists/listinfo/wonder-disc
>> 
> 
> -- 
> Tel: (602) 279-4600 ext: 635
> Desert Sky Software: www.desertsky.com
>    Specializing in the Development and Hosting of
>    e-Business Applications.


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct