When I try to push I get the "rejected non fast forward" problem, and when I try to pull to fix that I get the "nothing to fetch" problem. Any help is appreciated as I am generally new to eGit Eclipse. Thanks in advance.
I seems that the commit you want to push does not have the current HEAD of the branch you are pushing to as a predecessor. Can you share the output of git log --graph --oneline --all on the command line?