Setup global Kiwix/openZIM code collaboration rules

[kelson42]

This rules should permit a unified workflow about all our repos.

It should normalize:

• The relationship between Tickets and PRs
• The relationship between PRs and git branches
• The process of review/merging
• The commit and merging approaches (re-evaluate commitstyle.md)

[kelson42]

This is not an easy topic, I hope we can all together reach an agreement for Spring 2020.

[soloturn]

collection of links:

• gitflow: https://nvie.com/posts/a-successful-git-branching-model
• gitflow considered harmful: https://www.endoflineblog.com/gitflow-considered-harmful. saying gitflow causes a mess in the commit history.
• oneflow: https://www.endoflineblog.com/oneflow-a-git-branching-model-and-workflow

[benoit74]

collection of links:

* gitflow: https://nvie.com/posts/a-successful-git-branching-model

* gitflow considered harmful: https://www.endoflineblog.com/gitflow-considered-harmful. saying gitflow causes a mess in the commit history.

* oneflow: https://www.endoflineblog.com/oneflow-a-git-branching-model-and-workflow

I'm totally outside of Kiwix so it's hard to know which process fits your needs, but from my experience mastering a process like oneflow is already difficult for many developers. Git flow is way more complex and it gives you a wrong feeling of simplicity which in the ends always turns into a nightmare everytime I saw teams adopting this workflow. Not that the workflow cannot work, but the average developer get messed with it and it's often hard for maintainers to check that everything was done as supposed. I regularly saw tons of waste with git flow (lots of time wasted in merge operations, work lost or reverted e.g. due to merge issue not resolved correctly).

[stale[bot]]

This issue has been automatically marked as stale because it has not had recent activity. It will be now be reviewed manually. Thank you for your contributions.