X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=doc%2Fsource%2Fcontribute.rst;h=26ac918615aae02cfc2df31929217e3e0a6262fd;hb=79fd7d84fe8acbc03b857c4ff483db9c16a0c5b1;hp=cf87c1c417b17ac7e5bfcfadfe329d4c3e1f1a24;hpb=966e3a848b9d545530cc7c7a78c5185c69183b22;p=python-musicpd.git diff --git a/doc/source/contribute.rst b/doc/source/contribute.rst index cf87c1c..26ac918 100644 --- a/doc/source/contribute.rst +++ b/doc/source/contribute.rst @@ -8,13 +8,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 -------