Yep, no worries, I just wanted to confirm the process for getting a fix into the branch.
thanks again, Steve On 28/10/2011, at 12:49 PM, Eric Dalquist wrote: > Correct, if you "push upstream" you'll be pushing the commit(s) to the Jasig > uPortal repository. If you want to do a pull request you would go to: > > https://github.com/YOURUSERNAME/uPortal/tree/rel-3-2-patches > > Then click the Pull Request button in the upper right. Really though if the > changes are big enough to warrant a pull request you probably should have > followed the "Working in a Temporary Branch" instructions, the assumption is > that if you're commit directly on a primary branch (master or rel-*) the > change is a very simple no-brainer that doesn't need review or the history > advantages of a temp branch. > > -Eric > > On 10/27/11 8:28 PM, Steve Swinsburg wrote: >> >> Ok now we are in business, that makes a lot more sense, thanks Eric (SVN >> addict trying to switch;) >> >> I have successfully pushed my change up to my fork on github! >> >> So a final question. If I want to submit a pull request for that commit, I >> should NOT do: >> >>> # After verifying your fork looks good push your changes to the Jasig >>> uPortal repository >>> $ git push upstream rel-3-2-patches >> >> Because that will commit it directly to the main branch? >> >> Even though I have commit access and could commit it myself, I just wanted >> to confirm that step. >> >> cheers, >> Steve >> >> >> >> On 28/10/2011, at 12:16 PM, Eric Dalquist wrote: >> >>> So in the Forking and Cloning section here: >>> https://wiki.jasig.org/display/UPC/Git+Workflow it looks like you missed a >>> step that should look like: >>> $ git remote add upstream [email protected]:Jasig/uPortal.git >>> $ git fetch upstream >>> >>> Those two commands add a remote tracker named "upstream" in your local >>> repository which points to the Jasig uPortal repository >>> >>> Also when you did: >>> $ git push origin master >>> Nothing happened because your modifications were on the rel-3-2-patches >>> branch, not the master branch (master is the git equivalent of trunk in >>> svn) so after getting upstream setup you'd want to do: >>> >>> # Push your changes on the rel-3-2-patches branch to your GitHub fork to >>> verify the commits look good >>> $ git push origin rel-3-2-patches >>> >>> # After verifying your fork looks good push your changes to the Jasig >>> uPortal repository >>> $ git push upstream rel-3-2-patches >>> >>> -Eric >>> >>> >>> On 10/27/11 7:19 PM, Steve Swinsburg wrote: >>>> >>>> I'm working on the 3-2 branch and have a commit ready to be merged into >>>> the master branch (which I'd like to submit a pull request for) but I am >>>> unclear how I do that, from the branch. >>>> >>>> Here is what I have done (I already have a fork of uPortal in github) >>>> >>>> $ git clone [email protected]:steveswinsburg/uPortal.git >>>> >>>> $ cd uPortal/ >>>> >>>> $ git checkout -b rel-3-2-patches remotes/origin/rel-3-2-patches >>>> Branch rel-3-2-patches set up to track remote branch rel-3-2-patches from >>>> origin. >>>> Switched to a new branch 'rel-3-2-patches' >>>> >>>> $ edit <files> >>>> >>>> $ git diff >>>> The diff looks ok to me >>>> >>>> $ git add /path/to/file >>>> >>>> $ git commit -m "UP-12345 commit message" >>>> [rel-3-2-patches 415f415] UP-12345 commit message >>>> 1 files changed, 6 insertions(+), 1 deletions(-) >>>> >>>> $ git push origin master >>>> Everything up-to-date >>>> >>>> $ git push upstream master >>>> fatal: 'upstream' does not appear to be a git repository >>>> fatal: The remote end hung up unexpectedly >>>> >>>> That is where I am stuck. >>>> >>>> $ git status >>>> # On branch rel-3-2-patches >>>> # Your branch is ahead of 'origin/rel-3-2-patches' by 1 commit. >>>> # >>>> nothing to commit (working directory clean) >>>> >>>> >>>> Where to now? Is the commit up at github in my fork? >>>> >>>> cheers, >>>> Steve >>>> >>>> On 26/10/2011, at 2:41 PM, Eric Dalquist wrote: >>>> >>>>> After a few days of working with the uPortal source in GitHub we've come >>>>> up with a proposed workflow for the project and documented it in the >>>>> wiki: https://wiki.jasig.org/display/UPC/Git+Workflow >>>>> >>>>> There are a few workflow options, the direct merge option is only >>>>> applicable to uPortal committers but the Pull Request option is >>>>> applicable to committers and anyone else that is interested in supplying >>>>> patches to uPortal via GitHub Pull Requests. >>>>> >>>>> While patches supplied via Jira issues are still a great way to >>>>> contributed Pull Requests are even better, they allow VERY easy review of >>>>> the changes and how they merge and it just takes a click from any uPortal >>>>> committer to perform the merge. >>>>> >>>>> For those still getting to know git (that includes me) this is a great >>>>> reference: http://git.or.cz/course/svn.html Git really is a bit of a >>>>> paradigm shift from SVN and while we'll have our bumps for the next few >>>>> weeks I really think it is going to turn out to be a valuable move for >>>>> uPortal. >>>>> >>>>> If you have any comments or suggestions on the posted workflow, or tips & >>>>> tricks for working with git please post them! >>>>> >>>>> -Eric >>>>> >> >> -- >> >> You are currently subscribed to [email protected] as: >> [email protected] >> To unsubscribe, change settings or access archives, see >> http://www.ja-sig.org/wiki/display/JSG/uportal-dev -- You are currently subscribed to [email protected] as: [email protected] To unsubscribe, change settings or access archives, see http://www.ja-sig.org/wiki/display/JSG/uportal-dev
