Update git guidelines

[mitfik]

Introduce a bit fresh concept base on "A successful git branching model"[1] by Vincent Driessen.

[1] http://nvie.com/posts/a-successful-git-branching-model/

[teamon]

Couple of points:

• What about preprod or staging branches?
• Commit tags ([no review], [skip ci] etc) MUST stay

Besides the above, I don't see how is that at all different to what we use right now - what are the most important changes?

[mitfik]

Depends on that how you will define staging branch or what should be it purpose, your staging branch can be:

• master - if you want to test latest production
• release-* if you want to test specific release version or release candidate
• any feature branch - if you want to demonstrate/test specific feature

I removed [no review], [skip ci] etc. since I believe that this could be done much better.

The [no review] [ accepts ...] is part of code review, in my opinion that code review should be done for everything and I think all agreed that GHCR is not anymore sufficient for our needs. So any way new tool probably will handle that in a different way.

The [skip ci] I am not sure if this is a good place for this kind of information, why not configure CI to skip commits base on branches, or why not allow to do the job for all commits? Is there any use case for it? Why git commit msg should be link with CI system?

This flow does not differ much from that what we already have the most important changes are:

• code review done before merging, not after (this requires PR or platform like gerrit)
• pushing directly into development and master without review not possible
• code review for everything
• change name next to development

Except that rest is just same thing what was before written in a different way (in my opinion much cleaner)

[jandudulski]

The [skip ci] I am not sure if this is a good place for this kind of information, why not configure CI to skip commits base on branches, or why not allow to do the job for all commits? Is there any use case for it? Why git commit msg should be link with CI system?

Actually we don't use it much (if at all). It's just an option which CircleCi and Travis-CI gives you OOB.

[sheerun]

Déjà vu. And good luck with PR or Gerrit and managing feature/release branches.

[teamon]

I think we can close this one given we are using reviewable for code review.