...
[15:12:33 CDT(-0500)] <EricDalquist> what does "git remote -v" show you?
[15:12:48 CDT(-0500)] <athena> origin git@github.com:/bourey/uPortal.git (fetch)
[15:12:48 CDT(-0500)] <athena> origin git@github.com:/bourey/uPortal.git (push)
[15:12:48 CDT(-0500)] <athena> upstream git@github.com:Jasig/uPortal.git (fetch)
[15:12:48 CDT(-0500)] <athena> upstream git@github.com:Jasig/uPortal.git (push)
[15:12:56 CDT(-0500)] <EricDalquist> ok
[15:12:57 CDT(-0500)] <EricDalquist> try:
[15:13:08 CDT(-0500)] <EricDalquist> git push -f upstream HEAD^:master
[15:13:31 CDT(-0500)] <EricDalquist> that should un-push the last commit from upstream (jasig/uportal)
[15:13:44 CDT(-0500)] <athena> excelletn
[15:13:59 CDT(-0500)] <athena> looks like that did do it
[15:14:07 CDT(-0500)] <EricDalquist> great 
[15:14:14 CDT(-0500)] <athena> thanks so much - sorry about that
[15:14:20 CDT(-0500)] <athena> really not sure what happened there
[15:14:21 CDT(-0500)] <EricDalquist> no problem
[15:14:31 CDT(-0500)] <EricDalquist> do you have a lot of local work in progress?
[15:14:33 CDT(-0500)] <athena> no
[15:14:35 CDT(-0500)] <athena> nothing
[15:14:36 CDT(-0500)] <EricDalquist> if not you can always refork and reclone
[15:14:45 CDT(-0500)] <EricDalquist> just to make sure you're in the state you think you are
[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