[uportal-dev] Git Workflow Updates

After another few weeks of working with Git I've added some additional notes to the Git Workflow page. The primary changes are three new sections: How to Develop Features and Fixes Tips, Tricks, and Useful C

Re: [uportal-dev] Git Workflow

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 y

Re: [uportal-dev] Git Workflow

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 ar

Re: [uportal-dev] Git Workflow

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 pu

Re: [uportal-dev] Git Workflow

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 g...@github.com:Jasig/uPortal.git $ git fetch upstream Those two commands add a remote tracker named "upstream" in your

Re: [uportal-dev] Git Workflow

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 g...@github.com:steveswinsbu

Re: [uportal-dev] Git Workflow

FYI for those using Eclipse. EGit doesn't have any submodule support right now. That means when you do the normal M2E workflow and have a root uPortal project with additional submodule projects for things like uportal-war the git Team options are _only_ available on the root uPortal project.

[uportal-dev] Git Workflow

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