2012/5/18 Anssi Kääriäinen <anssi.kaariai...@thl.fi> > A heads up: I am working on Git and Github usage guidelines. There is > a ticket https://code.djangoproject.com/ticket/18307, and I have a > github branch with some initial work > https://github.com/akaariai/django/tree/django_git_guidelines > (or for changeset > https://github.com/akaariai/django/compare/django_git_guidelines) > > The guidelines in short: > - For trivial patches use pull requests directly > - For non-trivial patches, create a trac ticket, announce your work > by linking to your github branch, and when your work is ready to be > pulled in, only then do a pull request > - Aim for logically contained commits, commit messages of 50 char > summary line, 72 char paragraphs thereafter. > - When upstream has changed use git rebase instead of git pull > - When you do additional fixes to your work, use git rebase -i so > that your work still fullfills the logical commits requirement. > > Lots of more details in the WIP branch. All feedback welcomed. Lets > keep the discussion of any high-level issues here on django- > developers, as the choices made impact the whole community. > > The biggest issue is how we aim to use the pull requests. My take on > this is that pull requests should be only used for work ready for > committer. That is, the original author feels the work is ready, or he > doesn't know how to do anything more. If the pull requests are used > for feature requests or work-in-progress patches we risk having lots > of open tickets and lots of open pull requests. > > I have tried to gather pieces of wisdom around the net. I am not too > experienced with Git, so if you have experience with the above > mentioned and/or other Git workflows feedback is appreciated.
Looks excellent. Great work! -- Andrei Antoukh - <n...@niwi.be> http://www.niwi.be/page/about/ http://www.kaleidos.net/A5694F/ "Linux is for people who hate Windows, BSD is for people who love UNIX" "Social Engineer -> Because there is no patch for human stupidity" -- You received this message because you are subscribed to the Google Groups "Django developers" group. To post to this group, send email to django-developers@googlegroups.com. To unsubscribe from this group, send email to django-developers+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-developers?hl=en.
