<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<p>Hi all,</p>
<p>Nice move!</p>
<p>I have a minor note on the setup.</p>
<p>"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>
<br>
Just my 2c, maybe it helps to avoid some sleepless nights if this
adjusted right now ;)<br>
Matthias<br>
<br>
<div class="moz-cite-prefix">On 08/03/2017 02:32, Alexandre Neto
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:CA+H0G_HCHNquYit1-f3XxgvTkpEmzA9S1gLpjav8NTbMw-_TwA@mail.gmail.com">
<div dir="ltr">
<div>
<div>
<div>
<div>
<div>Hello All,<br>
<br>
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"
moz-do-not-send="true">[0]</a>, we decided to create
a master_3x branch <a
href="https://github.com/qgis/QGIS-Documentation/tree/master_3x"
moz-do-not-send="true">[1]</a>.<br>
<br>
From now on, all new features landing on QGIS 2.99
should be documented in the "master_3x" branch.<br>
<br>
</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"
moz-do-not-send="true"> [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>
</div>
<br>
</div>
<div>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>
</div>
<div><br>
</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>
<br>
<div>Thanks<br>
<br>
</div>
Alexandre Neto<br>
<br>
[0] - <a
href="https://lists.osgeo.org/pipermail/qgis-developer/2017-March/047346.html"
moz-do-not-send="true">https://lists.osgeo.org/pipermail/qgis-developer/2017-March/047346.html</a><br>
[1] - <a
href="https://github.com/qgis/QGIS-Documentation/tree/master_3x"
moz-do-not-send="true">https://github.com/qgis/QGIS-Documentation/tree/master_3x</a><br>
[2] - <a
href="https://github.com/qgis/QGIS-Documentation/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22QGIS+2.16%22"
moz-do-not-send="true">https://github.com/qgis/QGIS-Documentation/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22QGIS+2.16%22</a><br>
[3] - <a
href="https://github.com/qgis/QGIS-Documentation/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22QGIS+2.18%22"
moz-do-not-send="true">https://github.com/qgis/QGIS-Documentation/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22QGIS+2.18%22</a><br>
</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"
moz-do-not-send="true">http://sigsemgrilhetas.wordpress.com</a></div>
<a href="http://gisunchained.wordpress.com"
moz-do-not-send="true">http://gisunchained.wordpress.com</a><br>
</div>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
Qgis-developer mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Qgis-developer@lists.osgeo.org">Qgis-developer@lists.osgeo.org</a>
List info: <a class="moz-txt-link-freetext" href="https://lists.osgeo.org/mailman/listinfo/qgis-developer">https://lists.osgeo.org/mailman/listinfo/qgis-developer</a>
Unsubscribe: <a class="moz-txt-link-freetext" href="https://lists.osgeo.org/mailman/listinfo/qgis-developer">https://lists.osgeo.org/mailman/listinfo/qgis-developer</a></pre>
</blockquote>
<br>
</body>
</html>