Hi Jeanne,
I did what you suggested but when it came time to push, I got an error Git Pushed Failed window which says "remote repository contains commits unmerged into the local branch. Open output stream for more information." When I open the output stream, this is what I get:
==[IDE]== 03-Aug-2014 14:03:49 Pushing - guestu
git branch
git remote -v
setting up remote: origin
git submodule status
git push
https://github.com/daisyab/annotationprocessor.git refs/heads/master:refs/heads/master
Remote Repository Updates
Branch Update : master
Old Id : 24f2e598a842d13104bd461b2b63d58728cb07aa
New Id : 308f4c9813a0cdd36cf66c77c362a6c3608248ba
Result : REJECTED_NONFASTFORWARD
Local Repository Updates
Branch Update : origin/master
Old Id : 438f4ee949b723df988a9a7d6e41223b36769132
New Id : 308f4c9813a0cdd36cf66c77c362a6c3608248ba
Result : NOT_ATTEMPTED
==[IDE]== 03-Aug-2014 14:07:24 Pushing - guestu finished
What is the problem?