gistfile1.txt

so...he has a branch.  his branch has a local and a remote...he was local...and committed several times...then b/c when he pushed it said he couldn't b/c the origin of his branch was behind...because i merged the master into his origin branch so he could have all the updates, but he never pulled them

and continued to change his local branch...so his local branch and origin branch were so out of sync they couldn't resolve themselves...so i made him pull the remote of his branch (origin)...which apparently overwrote all of the local commits he had been doing all week

then he committed the local branch to get it in sync then pushed to the origin of his branch to make everything even again
...now...all those local commits that were overwritten are gone