Merging Git Branches

I have two branches, one is the master, one is 'test.' This name was dual-purpose, I was not only testing the branches, but testing out some changes as well. Now, I have the test branch working great. However, I am not working alone. The master branch is being worked on too. Now, I would love to copy my test branch over to the main. Then, I would love to do a pull and see what changes have been made so I can push the changes.

First, I am using Aptana. I tried the drop-down settings button. I clicked and attempted to merge while on the Master branch with the 'test' branch. This did something, not really sure what. It then said I had a problem. So, now, I ran git mergetool, and again, this did something. It said everything was good.Now, the two branches are both working as they should, however, they are not identical. In fact, they are both exactly what they were before any merge took place.

What can I do to fix this? 'test'开发者_StackOverflow社区 is the important branch right now, it has all my work. Master has some important stuff, but not locally. Any suggestions would be great.

First of all, commit and push every change in both branches.

Then, checkout to master, and merge test:

$git checkout master
$git merge test

It should display warning on every file that has a problem with merging. Sometimes Git can't figure out the "right" merge and you have to manually fix it. Go to those files, check for merge problems (they're easy to guess, Git wraps problems in <<<< ==== >>>>) And that's it! You have successfully merged test on master. Hope it helps!

The Aptana Git integration isn't as mature or advanced as the EGit one (see Aptana ticket 1372). And it involves having Git installed and correctly setup first.

Christopher Williams is working hard on improving the Aptana Git plugin, but in case of problem, going back to a shell session, like fedeisas's answer illustrates, is the best option.