...
[15:14:48 CDT(-0500)] <athena> yeah
[15:15:42 CDT(-0500)] <athena> think i may need to
[15:15:49 CDT(-0500)] <athena> seems like something got pretty screwed up in my fork
[15:17:46 CDT(-0500)] <athena> yeah, guessing i must have screwed up this merge somehow
[15:17:59 CDT(-0500)] <athena> https://github.com/bourey/uPortal/commit/c145935bde1d1e607947d784eb3604c9379cc26e
[15:18:14 CDT(-0500)] <athena> my fork thinks those are all brand new commits that aren't on the uportal side now
[15:18:50 CDT(-0500)] <EricDalquist> probably because of that original upstream issue
[15:18:56 CDT(-0500)] <athena> yeah, probably
[15:18:58 CDT(-0500)] <EricDalquist> you thought things were in sync
[15:19:03 CDT(-0500)] <EricDalquist> but they actually weren't
[15:19:07 CDT(-0500)] <athena> well, guess i can delete and recreate
[15:19:08 CDT(-0500)] <EricDalquist> which caused git to get confused
[15:19:10 CDT(-0500)] <EricDalquist> yeah
[15:19:14 CDT(-0500)] <athena> just a whole lot of time redownloading
[15:20:13 CDT(-0500)] <EricDalquist> :/
[15:20:17 CDT(-0500)] <athena> s'ok
[15:20:20 CDT(-0500)] <athena> live and learn and all that
[15:21:10 CDT(-0500)] <athena> so i just delete my repository on github, then go back to uportal and recreate it?
[15:21:18 CDT(-0500)] <EricDalquist> yup