<div dir="ltr"><div><div><div><div><p dir="ltr" class="gmail_msg">Hi Mathias,<br class="gmail_msg"></p>Having two babies in the house, I'm all for avoiding sleepless nights!<br><br></div>Not sure I followed your suggestion. AFAIK, The "master" branch (future release-2_18) is already the default branch. And our plan was to keep a close eye on that branch and continuously forward port everything from master to master_3x, to avoid that single "big bang".<br><br></div><div>Maybe I'm not understanding your suggestion. If you don't mind, I will ping you on gitter.<br><br></div><div>Alexandre Neto<br></div></div></div><div><div><div><div><br><div><div><div class="gmail_quote gmail_msg"><div dir="ltr" class="gmail_msg">A qua, 8/03/2017, 07:30, Matthias Kuhn <<a href="mailto:matthias@opengis.ch" class="gmail_msg" target="_blank">matthias@opengis.ch</a>> escreveu:<br class="gmail_msg"></div><blockquote class="gmail_quote gmail_msg" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div text="#000000" bgcolor="#FFFFFF" class="gmail_msg">
<p class="gmail_msg">Hi all,</p>
<p class="gmail_msg">Nice move!</p>
<p class="gmail_msg">I have a minor note on the setup.</p>
<p class="gmail_msg">"master_3x" will be merged into "master"* sounds like a plan, but
I guess in reality someone will spend days trying to figure out
how to solve those damned conflicts. I would strongly suggest
against merging production branches as this leads to a single "big
bang" with interleaved effects of documentation commits that have
already been forward ported and missing ones.</p>
Instead I would propose to follow the branching schema of QGIS. On
github you can define the "default branch" in the repository
settings to release-2_18, so pull requests will be opened against
this branch by default at the moment.<br class="gmail_msg">
<br class="gmail_msg">
Just my 2c, maybe it helps to avoid some sleepless nights if this
adjusted right now ;)</div><div text="#000000" bgcolor="#FFFFFF" class="gmail_msg"><br class="gmail_msg">
Matthias</div><div text="#000000" bgcolor="#FFFFFF" class="gmail_msg"><br class="gmail_msg">
<br class="gmail_msg">
<div class="m_8968461989051596275m_3823826662466796190moz-cite-prefix gmail_msg">On 08/03/2017 02:32, Alexandre Neto
wrote:<br class="gmail_msg">
</div>
</div><div text="#000000" bgcolor="#FFFFFF" class="gmail_msg"><blockquote type="cite" class="gmail_msg">
<div dir="ltr" class="gmail_msg">
<div class="gmail_msg">
<div class="gmail_msg">
<div class="gmail_msg">
<div class="gmail_msg">
<div class="gmail_msg">Hello All,<br class="gmail_msg">
<br class="gmail_msg">
As a result of a long discussion around how to
contribute with documentation for 3.x new features <a href="https://lists.osgeo.org/pipermail/qgis-developer/2017-March/047346.html" class="gmail_msg" target="_blank">[0]</a>, we decided to create
a master_3x branch <a href="https://github.com/qgis/QGIS-Documentation/tree/master_3x" class="gmail_msg" target="_blank">[1]</a>.<br class="gmail_msg">
<br class="gmail_msg">
From now on, all new features landing on QGIS 2.99
should be documented in the "master_3x" branch.<br class="gmail_msg">
<br class="gmail_msg">
</div>
All new documentation and improvements as we go through
the latest releases issues (2.16<a href="https://github.com/qgis/QGIS-Documentation/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22QGIS+2.16%22" class="gmail_msg" target="_blank"> [2]</a> and 2.18 [3]) should
still be worked on the master branch. When it makes
sense, the documentation team will do his best to
"forward port" them to master_3x branch.<br class="gmail_msg">
</div>
<br class="gmail_msg">
</div>
<div class="gmail_msg">After 2.18 release as LTR (June?) and consequent
release of 2.18 documentation, "master_3x" will be merged
into "master" and all should go back to normal. That is,
all contributions can be done in the "master" branch.<br class="gmail_msg">
</div>
<div class="gmail_msg"><br class="gmail_msg">
</div>
To help us document the all the new features, we kindly ask
all developers to add the [FEATURE] and [NEED-DOCS] tags in
their commits and provide some simple guidance on how to use
the new features in the commit message.<br class="gmail_msg">
<br class="gmail_msg">
<div class="gmail_msg">Thanks<br class="gmail_msg">
<br class="gmail_msg">
</div>
Alexandre Neto<br class="gmail_msg">
<br class="gmail_msg">
[0] - <a href="https://lists.osgeo.org/pipermail/qgis-developer/2017-March/047346.html" class="gmail_msg" target="_blank">https://lists.osgeo.org/pipermail/qgis-developer/2017-March/047346.html</a><br class="gmail_msg">
[1] - <a href="https://github.com/qgis/QGIS-Documentation/tree/master_3x" class="gmail_msg" target="_blank">https://github.com/qgis/QGIS-Documentation/tree/master_3x</a><br class="gmail_msg">
[2] - <a href="https://github.com/qgis/QGIS-Documentation/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22QGIS+2.16%22" class="gmail_msg" target="_blank">https://github.com/qgis/QGIS-Documentation/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22QGIS+2.16%22</a><br class="gmail_msg">
[3] - <a href="https://github.com/qgis/QGIS-Documentation/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22QGIS+2.18%22" class="gmail_msg" target="_blank">https://github.com/qgis/QGIS-Documentation/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22QGIS+2.18%22</a><br class="gmail_msg">
</div>
</div>
</div>
<div dir="ltr" class="gmail_msg">-- <br class="gmail_msg">
</div>
<div data-smartmail="gmail_signature" class="gmail_msg">
<div dir="ltr" class="gmail_msg">
<div class="gmail_msg">Alexandre Neto</div>
<div class="gmail_msg">---------------------</div>
<div class="gmail_msg">@AlexNetoGeo</div>
<div class="gmail_msg"><a href="http://sigsemgrilhetas.wordpress.com" class="gmail_msg" target="_blank">http://sigsemgrilhetas.wordpress.com</a></div>
<a href="http://gisunchained.wordpress.com" class="gmail_msg" target="_blank">http://gisunchained.wordpress.com</a><br class="gmail_msg">
</div>
</div>
<br class="gmail_msg">
<fieldset class="m_8968461989051596275m_3823826662466796190mimeAttachmentHeader gmail_msg"></fieldset>
<br class="gmail_msg">
</blockquote></div><div text="#000000" bgcolor="#FFFFFF" class="gmail_msg"><blockquote type="cite" class="gmail_msg"><pre class="gmail_msg">_______________________________________________
Qgis-developer mailing list
<a class="m_8968461989051596275m_3823826662466796190moz-txt-link-abbreviated gmail_msg" href="mailto:Qgis-developer@lists.osgeo.org" target="_blank">Qgis-developer@lists.osgeo.org</a>
List info: <a class="m_8968461989051596275m_3823826662466796190moz-txt-link-freetext gmail_msg" href="https://lists.osgeo.org/mailman/listinfo/qgis-developer" target="_blank">https://lists.osgeo.org/mailman/listinfo/qgis-developer</a>
Unsubscribe: <a class="m_8968461989051596275m_3823826662466796190moz-txt-link-freetext gmail_msg" href="https://lists.osgeo.org/mailman/listinfo/qgis-developer" target="_blank">https://lists.osgeo.org/mailman/listinfo/qgis-developer</a></pre>
</blockquote></div>
_______________________________________________<br class="gmail_msg">
Qgis-developer mailing list<br class="gmail_msg">
<a href="mailto:Qgis-developer@lists.osgeo.org" class="gmail_msg" target="_blank">Qgis-developer@lists.osgeo.org</a><br class="gmail_msg">
List info: <a href="https://lists.osgeo.org/mailman/listinfo/qgis-developer" rel="noreferrer" class="gmail_msg" target="_blank">https://lists.osgeo.org/mailman/listinfo/qgis-developer</a><br class="gmail_msg">
Unsubscribe: <a href="https://lists.osgeo.org/mailman/listinfo/qgis-developer" rel="noreferrer" class="gmail_msg" target="_blank">https://lists.osgeo.org/mailman/listinfo/qgis-developer</a></blockquote></div></div></div></div></div></div></div></div><div dir="ltr">-- <br></div><div data-smartmail="gmail_signature"><div dir="ltr"><div>Alexandre Neto</div><div>---------------------</div><div>@AlexNetoGeo</div><div><a href="http://sigsemgrilhetas.wordpress.com">http://sigsemgrilhetas.wordpress.com</a></div><a href="http://gisunchained.wordpress.com">http://gisunchained.wordpress.com</a><br></div></div>