Luca Barbato: > On 15/09/14 01:21, Patrick Lauer wrote: >> On Sunday 14 September 2014 15:42:15 hasufell wrote: >>> Patrick Lauer: >>>>> Are we going to disallow merge commits and ask devs to rebase local >>>>> changes in order to keep the history "clean"? >>>> >>>> Is that going to be sane with our commit frequency? >>> >>> You have to merge or rebase anyway in case of a push conflict, so the >>> only difference is the method and the effect on the history. >>> >>> Currently... CVS allows you to run repoman on an outdated tree and push >>> broken ebuilds with repoman being happy. Git will not allow this. >> >> iow, git doesn't allow people to work on more than one item at a time? > > It does. >
I think we really have to write up a step-by-step guide (not just workflow policies) for people who have never seriously worked with git. On the other hand... there are thousands of tutorials on the net already. For the workflow model, I already have created a draft which is in no way finished or even correct and there are still some controversially discussed issues. https://wiki.gentoo.org/wiki/Gentoo_git_workflow
