How to get the latest commits from Parent to Child after Merging in TFS -

in tfs, have made branch parent repository days , started working on child base. during these period, team made significant changes in parent branch , committed yesterday. have find way change sets parent in branch out losing changes. if have idea, please share

you can merge parent branch. if there conflicts, can compare files , resolve conflicts manually. see https://msdn.microsoft.com/en-us/library/ee341461(v=expression.40).aspx