I usually do something like this http://wiki.github.com/rakudo/rakudo/frews-recommended-workflow (Note: I would never use an old-time patch/diff file when using git, but the rest of article is fine)
That is master (as in learn) rebase and interactive rebase when creating a patch (or patch series). Simplified workflow (add, commit, diff etc. of local workflow assumed known here): 0) Always work on 'myname/workbranch' (never myname/master), then before sharing local work... 1) use 'git rebase': to rebase work-branch to tip of master before pushing (to avoid conflicts for upstream integrator) 2) use 'git rebase -i': to clean up patch series before pushing (squash, pick etc) and deliver 'logical/clean changes' to upstream integrator 3) git push to myname/work-branch (git push origin workbranch) 4) Send pull request....and wait for feedback 5) If accepted (i.e. pulled in upstream) a 'git pull upstream master' will work without conflicts, and workbranch can be deleted. There are so many tutorials and best practices, but I haver found that the official GIT manual has some great advice about working with patch (series). HTH Maxild On 29/03/2010, at 23.07, John Simons wrote: > I found a few instructions on how to send a patch: > http://wiki.github.com/rakudo/rakudo/steps-to-create-a-patch > http://wiki.github.com/rakudo/rakudo/frews-recommended-workflow > Are these instructions usable for us? or are we just going to support > pull requests? > > Git experts, we do need some advice? > > Cheers > John > > On Mar 30, 7:55 am, John Simons <[email protected]> wrote: >> Actually it gets even worse. >> Now if you try to do a pull request "maxild" appears in the list as >> well, for all castle projects! >> So, does this mean that every time we merge a pull request the user >> that sent it gets automatically added to the list? >> >> Cheers >> John >> >> On Mar 30, 5:52 am, Michael Davis <[email protected]> wrote: >> >>> Are there any guidelines on which people to include on a pull request? >> >>> I've got a patch for Windsor I'd like to submit >>> (seehttp://groups.google.com/group/castle-project-users/browse_frm/thread... >>> andhttp://groups.google.com/group/castle-project-users/browse_frm/thread... >>> ), and when I go to make the pull request, there are 15 accounts >>> selected by default and 5 more that aren't. >> >>> Is it preferred to send the request to all of the people selected by >>> default, or should I limit it to just a few or one? And if I limit >>> the request, who should get it? >> >>> If any of this depends on the project, then that definitely should be >>> documented somewhere, as well. >> >>> Thanks, >>> Michael Davis >> >>> On Mar 25, 3:55 pm, John Simons <[email protected]> wrote: >> >>>> Also should we add to each repository a readme file with info like >>>> this:http://github.com/DarthFubuMVC/fubumvc#readme >> >>>> Cheers >>>> John >> >>>> On Mar 26, 7:49 am, Simon <[email protected]> wrote: >> >>>>> perhaps just point to a few intros on github and git? >> >>>>> eghttp://help.github.com/forking/http://kylecordes.com/2008/04/30/git-w... >> >>>>> On Mar 24, 10:03 am, John Simons <[email protected]> wrote: >> >>>>>> We also need to update the Release Guide >>>>>> -http://www.castleproject.org/community/releaseguide.html >> >>>>>> Cheers >>>>>> John >> >>>>>> On Mar 24, 9:42 am, Henry Conceição <[email protected]> wrote: >> >>>>>>> Hi mates, >> >>>>>>> I did update all the subversion mentions on the website and pointed to >>>>>>> github or the git repository. The only exception is the create a patch >>>>>>> page. >> >>>>>>> @git experts: can someone update it with a nice guide, please? >> >>>>>>> Cheers, >>>>>>> Henry Conceição > > -- > You received this message because you are subscribed to the Google Groups > "Castle Project Development List" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/castle-project-devel?hl=en. > -- You received this message because you are subscribed to the Google Groups "Castle Project Development List" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/castle-project-devel?hl=en.
