Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setup global Kiwix/openZIM code collaboration rules #18

Open
kelson42 opened this issue Jul 3, 2019 · 4 comments
Open

Setup global Kiwix/openZIM code collaboration rules #18

kelson42 opened this issue Jul 3, 2019 · 4 comments

Comments

@kelson42
Copy link
Contributor

kelson42 commented Jul 3, 2019

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 kelson42 self-assigned this Jul 3, 2019
@kelson42
Copy link
Contributor Author

kelson42 commented Jul 3, 2019

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

@soloturn
Copy link

soloturn commented Jul 4, 2019

collection of links:

@benoit74
Copy link
Collaborator

benoit74 commented Jan 2, 2020

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
Copy link

stale bot commented Mar 2, 2020

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.

@stale stale bot added the stale label Mar 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants