When I give git diff localBranch:file master:file
, it is showing the difference between two files across specified branches. But, when I give git merge origin/master
from my local branch, those differences are not reflecting to my local file. Also, It is showing "Already up-to date"
Note: I manually made changes and merged my branch with master and pushed my local branch to remote repo, so I don't have any proofs or evidence to show
you can do git log --state
give hash branch and git diff HASH
.
You can locked commits current branch before merge git cherry -v master
and ggi hash too.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.