Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Corrected links that should have been relative instead of absolute.

...

[14:05:46 CDT(-0500)] <EricDalquist> that would be a long and expensive trip in a cessna with a 2 year old

[14:07:38 CDT(-0500)] <Daskreech> Not really

[14:08:16 CDT(-0500)] <Daskreech> Strap on a parachute or hang glider and I'm sure it would be the longest carnival ride for a 2 year old ever

[14:09:04 CDT(-0500)] <EricDalquist> lol

[16:17:25 CDT(-0500)] <drewwills1> for the "Shared Repository Model" (described here: https://wiki.jasig.org/display/UPC/Git+Workflow), do you nevertheless create a new fork on github? or rather do you connect your local directly to the Jasig master?

[16:18:05 CDT(-0500)] <EricDalquist> you can create a fork on github if you'd like to

[16:18:49 CDT(-0500)] <drewwills1> did you? which is more recommended?

[16:18:54 CDT(-0500)] <EricDalquist> having your own fork is handy for a few possible reasons: 1 you think you might want to do a pull request at some point in the future, 2 you want to have a place to push working branches to so you can grab them from other machines

[16:19:07 CDT(-0500)] <EricDalquist> I have a fork, primarily because I do uPortal development on two different machines

[16:19:14 CDT(-0500)] <EricDalquist> my work desktop and my personal laptop

[16:19:45 CDT(-0500)] <EricDalquist> so when I'm working on something that takes more than a few hours I can push my temp branch to my fork

[16:19:54 CDT(-0500)] <EricDalquist> and pull it down on other machines then

[16:20:11 CDT(-0500)] <EricDalquist> note that with the way git works having a fork doesn't mean extra repositories on your development machine

[16:20:26 CDT(-0500)] <drewwills1> ah that's sensible... actually I was planning to make a pull request soon... i have the uP changes for showing tips/alerts ready (and want to get them "off my plate") but they can't go in totally until the next releast of widget portlets

[16:20:39 CDT(-0500)] <EricDalquist> you end up with a local repository that points to both Jasig/uPortal and You/uPortal

[16:20:45 CDT(-0500)] <EricDalquist> and you can interact with both of them

[16:21:08 CDT(-0500)] <drewwills1> er "i see" (well not entorely yet... but i willl)

[16:21:13 CDT(-0500)] <drewwills1> entorely

[16:21:16 CDT(-0500)] <drewwills1> blah

[16:21:19 CDT(-0500)] <EricDalquist> yeah, it takes a bit to get used to (smile)

[16:21:21 CDT(-0500)] <drewwills1> entirely

[16:22:08 CDT(-0500)] <drewwills1> lol @"Hardcore Forking Action"

[16:22:16 CDT(-0500)] <EricDalquist> (smile)

[16:22:42 CDT(-0500)] <EricDalquist> I was just chatting with jen about how I want to use git here at UW for our uP4 implementation

[16:23:42 CDT(-0500)] <EricDalquist> my gradually increasing understanding is that we could essentially fork uPortal into our own git hosting server

[16:24:03 CDT(-0500)] <EricDalquist> then create a branch from master for our UW customizations to uP4

[16:24:18 CDT(-0500)] <EricDalquist> then as a developer I would have one uPortal repository checked out

[16:24:48 CDT(-0500)] <EricDalquist> with one remote pointing to github:Jasig/uPortal, one to github:edalquist/uPortal and one to uw:shared/uPortal

[16:25:28 CDT(-0500)] <EricDalquist> and it would let me easily merge in full updates or cherry pick certain commits from Jasig/uPortal into our branch

[16:25:42 CDT(-0500)] <EricDalquist> and I could easily push local features to edalquist/uPortal and make pull requests

[16:26:01 CDT(-0500)] <EricDalquist> so there is a lot of potential for even easier flow of patches between Jasig and deployers