KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Edit Question
Title
Body
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 A screen full of changes appears showing the differences. I want to merge the changes in the test branch and so do: git merge test But get the message "Already up-to-date" However, examining files under each different branch clearly shows differences. What's the problem here and how do I resolve it?
Tags (comma-separated)
Save Edits
Cancel