<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body dir="auto"><div>My proposal on Gitter was to keep master as the true dev branch and releasing stable branches on major releases. That seemed like overhead at the time and we agreed to go with a git-flow type model. Sometimes the 'master by default' thinking has PRs being issued to master by mistake.</div><div id="AppleMailSignature"><br></div><div id="AppleMailSignature">What do folks think about:</div><div id="AppleMailSignature"><br></div><div id="AppleMailSignature">- eliminating develop branch</div><div id="AppleMailSignature">- working off master as latest</div><div id="AppleMailSignature">- creating stable branches off major releases</div><div id="AppleMailSignature"><br></div><div id="AppleMailSignature">Example for a major release:</div><div id="AppleMailSignature">- create x.y.z tag</div><div id="AppleMailSignature">- create x.y stable branch</div><div id="AppleMailSignature">- bug fixes are applied against master and x.y</div><div id="AppleMailSignature">- bug fix releases are made against x.y branch</div><div id="AppleMailSignature">- new features are applied against master</div><div id="AppleMailSignature"><br></div><div id="AppleMailSignature">Thoughts?</div><div id="AppleMailSignature"><br></div><div id="AppleMailSignature">..Tom<br><br>Sent from my iPhone</div><div><br>On Sep 1, 2017, at 15:38, Jachym Cepicky <<a href="mailto:jachym.cepicky@gmail.com">jachym.cepicky@gmail.com</a>> wrote:<br><br></div><blockquote type="cite"><div><div dir="ltr">Hi,<div><br></div><div>I've just now put PyWPS `master` back to where it belongs 7cab386<br></div><div><br></div><div>Before I did , I merged the code which was added to master to `develop` branch - no code should be lost.</div><div><br></div><div>From now on, we have to carefully read, where the pull requests are supposed to be merged and not accept those pull requests, which are done against master.</div><div><br></div><div>Related to this:</div><div><br></div><div>I would suggest, we open our development policy one more time, seems, people are confused about the fact, that master is stable and not development branch. @TomKralidis had some alternative proposal on Gitter, maybe it could be shared in the mailing list, I would like to have PSC decided about this.</div><div><br></div><div>J</div></div><br><div class="gmail_quote"><div dir="ltr">pá 1. 9. 2017 v 15:43 odesílatel Luís Moreira de Sousa <<a href="mailto:luis.de.sousa@protonmail.ch">luis.de.sousa@protonmail.ch</a>> napsal:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div>Hi Jachym, that sounds good. But which commits exactly were pushed to the master branch? Depending on that we could have a minor odd release as Jorge suggests.<br></div><div><br></div><div>Cheers.<br></div><div class="m_-1635495664983396338protonmail_signature_block"><div class="m_-1635495664983396338protonmail_signature_block-user"><div><br></div><div>-- <br></div><div>Luís Moreira de Sousa<br></div><div>Im Grund 6<br></div><div>CH-8600 Dübendorf<br></div><div>Switzerland<br></div><div><br></div><div>Phone: <a href="tel:+41%2079%20812%2062%2065" value="+41798126265" target="_blank">+41 (0)79 812 62 65</a><br></div><div>Email: <a href="mailto:luis.de.sousa@protonmail.ch" target="_blank">luis.de.sousa@protonmail.ch</a><br></div><div>URL: <a href="https://sites.google.com/site/luismoreiradesousa" target="_blank">https://sites.google.com/site/luismoreiradesousa</a><br></div></div><div class="m_-1635495664983396338protonmail_signature_block-proton m_-1635495664983396338protonmail_signature_block-empty"><br></div></div><div><br></div><blockquote class="m_-1635495664983396338protonmail_quote" type="cite"><div>-------- Original Message --------<br></div><div>Subject: Re: [Pywps-dev] git branches confusion (mess)<br></div><div>Local Time: August 31, 2017 9:16 AM<br></div><div>UTC Time: August 31, 2017 7:16 AM<br></div><div>From: <a href="mailto:jorge.dejesus@geocat.net" target="_blank">jorge.dejesus@geocat.net</a><br></div><div>To: Jachym Cepicky <<a href="mailto:jachym.cepicky@gmail.com" target="_blank">jachym.cepicky@gmail.com</a>>, <a href="mailto:pywps-dev@lists.osgeo.org" target="_blank">pywps-dev@lists.osgeo.org</a> <<a href="mailto:pywps-dev@lists.osgeo.org" target="_blank">pywps-dev@lists.osgeo.org</a>><br></div><div><br></div><div> <br></div><p>Hi to all<br></p><p>I am more in favor of 1 :), but maybe do a pywps 4.0.1 release?<br></p><p>J.<br></p><div class="m_-1635495664983396338moz-cite-prefix">On 28-08-17 07:34, Jachym Cepicky
wrote:<br></div><blockquote type="cite"><div dir="ltr"><div>Hi all, <br></div><div><br></div><div>seems, we have pushed to `master` instead of to `develop`
? <br></div><div><br></div><div>Suggestions? <br></div><div><br></div><div>I would do:<br></div><div><br></div><div>1 - merge master to develop<br></div><div>2 - reset master back to where it was (pywps-4.0.0)<br></div><div><br></div><div>J<br></div></div><div><br></div><div><br></div><pre>_______________________________________________
pywps-dev mailing list
<a href="mailto:pywps-dev@lists.osgeo.org" class="m_-1635495664983396338moz-txt-link-abbreviated" target="_blank">pywps-dev@lists.osgeo.org</a>
<a href="https://lists.osgeo.org/mailman/listinfo/pywps-dev" class="m_-1635495664983396338moz-txt-link-freetext" target="_blank">https://lists.osgeo.org/mailman/listinfo/pywps-dev</a><br></pre></blockquote></blockquote><div><br></div></blockquote></div>
</div></blockquote><blockquote type="cite"><div><span>_______________________________________________</span><br><span>pywps-dev mailing list</span><br><span><a href="mailto:pywps-dev@lists.osgeo.org">pywps-dev@lists.osgeo.org</a></span><br><span><a href="https://lists.osgeo.org/mailman/listinfo/pywps-dev">https://lists.osgeo.org/mailman/listinfo/pywps-dev</a></span></div></blockquote></body></html>