[QGIS-Developer] How to structure GitHub repository for different plugin versions

[Martin Dobias]

Hi Sophie

On Fri, Aug 24, 2018 at 10:57 AM Sophie Crommelinck
<sophie.crommelinck at gmail.com> wrote:
>
> I would like to upload a QGIS3 version of a plugin that is now available as QGIS2 version. Is there a general approach on how to structure the plugin repository on GitHub accordingly? One idea would be to have two folders e.g. 'QGIS2' and 'QGIS3' in the main plugin repository. Paolo suggested there might be a general code of conduct on this one.

I think generally people do one of these options:
- have one git branch for qgis2 and another branch (e.g. master) for qgis3
- make the plugin compatible with both qgis2 and qgis3, so you
maintain just one codebase instead of two. For some plugins that's
easy to do, but some plugins require a significant amount of effort.

Having two folders in the repository is inferior to using branches in
my opinion... with git branches it is easier to do diffs and port
fixes from one branch to the other.

In QGIS git repository, right now we use master branch for development
of QGIS 3.4, but we also keep a branch for QGIS 3.2.x where we apply
some commits (bugfixes) from master branch.

Cheers
Martin