PR merging options

[Justin Obara]

Hi everyone,

After our planning meeting yesterday, several of us hung back to talk about PR merging options. The original discussion started in the fluid-work IRC channel <http://irc-logs.fluidproject.org/#fluid-work/%23fluid-work.2020-06-02.log>.

I’ve written up the information we gathered in our discussion and put it up on the wiki at Git Merge Strategies <https://wiki.fluidproject.org/display/fluid/Git+Merge+Strategies>. Please feel free to add/amend that page. In general this is to provide some ideas for options that projects can use for merging PRs, and is not intended to be prescriptive of what method must be used.

Thanks
Justin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.idrc.ocad.ca/pipermail/fluid-work/attachments/20200603/3525d1fb/attachment.html>