On May 18, 2012 4:43 AM, "Anssi Kääriäinen" <anssi.kaariai...@thl.fi> wrote: > > 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
A rebase workflow has always been problematic, in my experience. It will cause previously published commits to be rewritten, changing their hashes, and invalidating other branches, forks, or installations depending on them. I also think rebasing can seriously devalue the history of a branch, by eradicating the context in which changes had been made. Even the got developers will recommend not rebasing public commits. I think we should follow that advice. > - 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. > > - Anssi > > -- > 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. > -- 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.
