X-Git-Url: http://git.kaliko.me/?p=python-musicpd.git;a=blobdiff_plain;f=doc%2Fsource%2Fcontribute.rst;h=dd1c5c122a6f6751ed06618429880b3325c63861;hp=cf87c1c417b17ac7e5bfcfadfe329d4c3e1f1a24;hb=57628d1d2e54b60c27ff5bcf60c6d17beeffc22c;hpb=966e3a848b9d545530cc7c7a78c5185c69183b22 diff --git a/doc/source/contribute.rst b/doc/source/contribute.rst index cf87c1c..dd1c5c1 100644 --- a/doc/source/contribute.rst +++ b/doc/source/contribute.rst @@ -1,3 +1,6 @@ +.. SPDX-FileCopyrightText: 2018-2021 kaliko +.. SPDX-License-Identifier: GPL-3.0-or-later + Contributing ============= @@ -8,13 +11,14 @@ Git Workflow * ``master`` branch holds latest stable|release code * ``dev`` branch holds current development code * Work on a dedicated branch starting off ``dev`` -* I like fast forward merges, **please rebase on** ``dev`` **branch** +* I like fast forward merges, **please rebase on** ``dev`` branch before submitting changes * Advertise your work (cf. Note) .. NOTE:: **Git merge Workflow** |br| I currently don't care about a specific workflow concerning changes submission. |br| - gitlab merge request, gh pull request, plain email pointing out a repo/ref. All we need is a public git repo and a ref to fetch from as long you rebased on ``dev`` branch. + Don't bother with gitlab merge request or gh pull request. |br| + All we need is a public git repo and a ref to fetch from as long you rebased on ``dev`` branch. Coding -------