Merge from the bitbukcet not showing changes in the target branch

[samba buddi]

Hi All,

I have a scenario which is weird to me. Please let me know if you anyone is having a solution for this problem.

We have release branch with few .java and .jsp file changes. there are the updated changes from the existing master branch code. when we merge this release branch to the master, these new changes are not getting updated (Only jsp files have the issue), whereas java files are getting updated fine. 

Did any one faced similar kind of issue. do we need have any setting for this.