Every time I try to push I get reject non-fast forward. If I push from the terminal it works just fine.
I am using Ubuntu Natty latest eclipse Egit plugin git https
Windows->Preferences->Team->Git->Configuration->Repository Settings->Add Entry
Just add two key: 'merge' and 'remote' like the following pic.