git merge with automatically resolving conflicts as “use their version”

Question

I am developing an application where the source control is handled by git. There is one feature which is developed in a separate branch, let\'s call it ChildBranch. The deve