0

My eclipse workspace

enter image description here

Github repo

enter image description here

My workspace has few changes that I want to push to github. I've already commit'd them. Wen I try Push from eclipse, I get the below

enter image description here

I am not sure what I am doing wrong

When I right click on the project Team>Switch To>Other..., I see the below (hoping this would help)

enter image description here

EDIT 1

Below is the History on my project. What I want is to merge the 2 commits above b697278 to b697278 (as that is what is there on github).

enter image description here

Aravind R. Yarram
  • 175
  • 1
  • 2
  • 6

1 Answers1

1

Looks like you've created your new commits while not being on the master branch - your HEAD and MASTER are pointing to a different commits. All you have to do is to merge you new commits into MASTER. Here are the commands:

git checkout master
git merge 327de48

Once your new commits are in the master your push should work, because git will see the difference between local and remote master.

Eugene Ryzhikov
  • 126