Hi Bjorn, On 22 February 2016 at 11:49, Björn Blissing <[email protected]> wrote:
> 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. > > You need to versions of the files to graphically diff between to do a proper code review, so having one repository with separate branches to jump between won't cut it. Jumping between different branches is not simple compared than my current approach where I have users send their files and I just run a script to compare them. In most cases any merging is done explicitly by me, one line at a time. Often I won't do a full merge, cherry picking individual lines or re-writing them as I go through the code to get the final version. Robert.
_______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
