I have an issue where I am now trying to merge a branch which isnt including all of the updated files.
In the past I merged this branch (lets call it branch2) into ma
