Hello,
I have almost 4 years of experience working with Git on both Windows and Linux as well as with github. I have run into the exact same problem that you have and would like to sit down and help you understand both how to fix the issue and the cause of the issue.
Be warned that my experience with Git is using a command line interface (terminal in Linux, [login to view URL] in Windows), however the commands for Git are the same regardless of operating system.