I respectfully disagree. If you follow the procedure in the link in my previous message, you will have a really quick and simple workflow.
Just checkout the pull request to a separate branch, (no need for a separate repo, just stash any uncommitted changes to whatever branch you were working with). If the pull request looks good, just merge the changes to master (and/or any other branch). Then just switch back to master and delete the previously created branch. Regards Björn From: osg-submissions [mailto:[email protected]] On Behalf Of Robert Osfield Sent: Monday, February 22, 2016 12:42 PM To: OpenSceneGraph Submissions <[email protected]> Subject: Re: [osg-submissions] osgParticle freeze on cull fix On 22 February 2016 at 11:28, Björn Blissing <[email protected]<mailto:[email protected]>> wrote: Hi Robert et al. My work flow regarding pull request is to first merge the changes to a branch on my local machine. Then I can use my normal diff tools and even compile the code if necessary. Then (if I am satisfied) I can merge it back to master and push the changes to the main repo. This requires having two local repositories on my dev machine, one tracking master/or another branch and another for the temporary application of pull requests. You also need to keep track of which files are being changed and diff against these. It's all more work and complexity than I have to do right now when users send the modified files, so I'm not won over it as a work-flow. Occasionally it'll be able to resolve some merge issues better, but I suspect for most cases it'll be more work for me. Robert.
_______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
