Hi Andrew! Hi Duncan! Cheers for the instruction. I will open a ticket and make the changes this week.
Best, malte On 11 Sep 2014, at 01:06, Andrew Pinkham <[email protected]> wrote: > On Sep 10, 2014, at 4:21 PM, Malte <[email protected]> wrote: >> That's a lot of locales to change though. I am still somewhat new to Git. >> How would you go about it? > > I asked about Git recently on the Django Core Mentorship list. Carl Meyer > responded with a really good workflow for creating a PR. I have copied key > parts of his response below. > > Begin forwarded message: >> The best way [...] is to always use a new branch for >> each pull request, instead of making your changes directly in master. >> This way it doesn't matter whether your PR is merged exactly as-is, or >> is squashed or otherwise modified (as happened in this case) -- either >> way master always tracks exactly what happened upstream, without >> interference from your original version of the changes. >> >> Sample sequence of git commands you might use to make a new local branch >> and make a PR from it (with interspersed commentary): >> >> # First make sure your new branch will based on the latest master >> $ git checkout master >> # If your local master tracks upstream, you can omit "upstream master": >> $ git pull upstream master >> >> # Create a branch: I often name it tXXXXX for the Trac ticket # >> $ git checkout -b t22951 >> >> # Make your changes and commit them... >> >> # Then push your local branch to a branch of the same name >> # on your GitHub remote. The -u sets up a "tracking" relationship, >> # so in future you can just "git push" from this branch and it will >> # automatically know where to push to. >> $ git push -u origin t22951 >> >> Now if you visit GitHub shortly after this push, it'll automatically >> prompt you to create a pull-request from your recently-pushed t22951 branch. > > Tim Graham also pointed me to a part of the documentation that may be helpful: > > https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/submitting-patches/#patch-review-checklist > > Hope that helps, > Andrew > > -- > You received this message because you are subscribed to a topic in the Google > Groups "Django developers" group. > To unsubscribe from this topic, visit > https://groups.google.com/d/topic/django-developers/RCcsR8sGmX4/unsubscribe. > To unsubscribe from this group and all its topics, send an email to > [email protected]. > To post to this group, send email to [email protected]. > Visit this group at http://groups.google.com/group/django-developers. > To view this discussion on the web visit > https://groups.google.com/d/msgid/django-developers/CBD94E54-A792-4C73-8699-9431AE6EE073%40andrewsforge.com. > For more options, visit https://groups.google.com/d/optout.
signature.asc
Description: Message signed with OpenPGP using GPGMail
