I have two branches, one is a master, one is a "test". This name was dual-purpose, I not only tested the branches, but also tested some changes. Now my test branch is working. However, I do not work alone. The lead branch also works. Now I would like to copy my test branch to the main one. Then I would like to try and see what changes have been made, so I can make changes.
Firstly, I use Aptana. I tried the dropdown menu button. I clicked and tried to merge in the master branch with the "test" branch. This did something not quite sure of what. Then he said that I have a problem. So now I was running git mergetool, and again this was doing something. He said that all is well. Now these two branches work as they should, however, they are not identical. In fact, they are both exactly what they were before the merger.
What can I do to fix this? "Test" is an important industry right now, I have all my work. The wizard has some important things, but not locally. Any suggestions would be great.
source
share