I have a git repository with 2 branches: master and test.
There are differences between master and test branches.
Both branches have all changes committed.
If I do:
git checkout master
git diff test
git merge test
The message “Already up-to-date” means that all the changes from the branch you’re trying to merge have already been merged to the branch you’re currently on. More specifically it means that the branch you’re trying to merge is a parent of your current branch. Congratulations, that’s the easiest merge you’ll ever do. :)
gitk to take a look at your repository. The label for the “test” branch should be somewhere below your “master” branch label.