File is not up to date for branch merging
Created by: niuzhiheng
When file updated in different branches and finally merged to one, gitlab does not show the correct one but the latest revised one in one of the branches.
For example, one file contains the content of aa in base branch and changed to bb and cc respectively in two branches and finally merged as bb. But in gitlab the current one will show cc, I think only because it is the latest revision before merging. It is illustrated as below.
aa___bb_______bb |_____cc|