Re: [uportal-dev] Git Workflow

[Eric Dalquist]

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.

It appears that the next minor release of EGit should solve this problem though it is a few months out: https://bugs.eclipse.org/bugs/show_bug.cgi?id=314853

-Eric

On 10/25/11 10: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.

-Eric

If you have any comments or suggestions on the posted workflow, or tips & tricks for working with git please post them!

smime.p7s
Description: S/MIME Cryptographic Signature