Differences between 2 branches after merge: GIT
问题 I am currently working on a second branch called NC12-changePassword . There have been changes made to master branch which handle decrypting of a string. I required these new changes to be able to implement a new feature on my branch so I merged the changes. I did a git pull and there were no conflicts. When I run git log it shows the merge commit. Also when I run git merge master it tells me everything is up to date. However my code is not working and when I run git diff NC12-changePassword