|Can't Merge into master [message #1732015]
||Wed, 11 May 2016 18:48
| Mark Baumann
Registered: May 2016
Hello, I am a new user of both Eclipse and Git. Please forgive the newbie question.|
I have no remote repository. I am the only programmer on this project. I am using git for my own personal version control and also just to get some experience learning how to use git.
I created a branch off of master called "HashMapApproach" to try a new approach in my project.
After committing some changes to the HashMapApproach branch, I am happy with how things are working and now I would like to merge those changes into master. But I haven't been able to do that successfully. Here's what I've tried...
I first checkout master. Then I've tried to merge in two ways:
1 - Team -> Merge Tool, but this option is grayed out
2 - In the History view, I right-click on master and choose Merge. This gives the result "Already-up-to-date". However, it never prompted me as to which branch I was trying to merge with.
When I checkout master and look at the History view, I can no longer see the HashMapApproach branch because HEAD points to master and the History stops there. When I checkout HashMapApproach, HEAD now points there and I can see the master which exists farther back in my History. In this case, if I right-click on master in History and choose merge, it again gives me the "Already-up-to-date" message.
All of the above results seem to imply that everything is up-to-date. However, nothing has changed in the master branch and if I checkout the two branches and compare them I see that the two branches are still clearly different. The changes from HashMapApproach have not been merged into master. master is still unchanged.
Is there something obvious I am missing here?
Thank you for your help!
Powered by FUDForum
. Page generated in 0.01550 seconds