[Qgis-developer] New branch for 3.x documentation (master_3x)

[Matthias Kuhn]

Hi all,

Nice move!

I have a minor note on the setup.

"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.

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.

Just my 2c, maybe it helps to avoid some sleepless nights if this
adjusted right now ;)
Matthias

On 08/03/2017 02:32, Alexandre Neto wrote:
> Hello All,
>
> As a result of a long discussion around how to contribute with
> documentation for 3.x new features [0]
> <https://lists.osgeo.org/pipermail/qgis-developer/2017-March/047346.html>,
> we decided to create a master_3x branch [1]
> <https://github.com/qgis/QGIS-Documentation/tree/master_3x>.
>
> From now on, all new features landing on QGIS 2.99 should be
> documented in the "master_3x" branch.
>
> All new documentation and improvements as we go through the latest
> releases issues (2.16[2]
> <https://github.com/qgis/QGIS-Documentation/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22QGIS+2.16%22>
> 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.
>
> 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.
>
> 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.
>
> Thanks
>
> Alexandre Neto
>
> [0] -
> https://lists.osgeo.org/pipermail/qgis-developer/2017-March/047346.html
> [1] - https://github.com/qgis/QGIS-Documentation/tree/master_3x
> [2] -
> https://github.com/qgis/QGIS-Documentation/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22QGIS+2.16%22
> [3] -
> https://github.com/qgis/QGIS-Documentation/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22QGIS+2.18%22
> -- 
> Alexandre Neto
> ---------------------
> @AlexNetoGeo
> http://sigsemgrilhetas.wordpress.com
> http://gisunchained.wordpress.com
>
>
> _______________________________________________
> Qgis-developer mailing list
> Qgis-developer at lists.osgeo.org
> List info: https://lists.osgeo.org/mailman/listinfo/qgis-developer
> Unsubscribe: https://lists.osgeo.org/mailman/listinfo/qgis-developer

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/qgis-developer/attachments/20170308/b27d97cd/attachment.html>