Is there any way to merge two branches while keeping "ours" changes for changed files (added, modified, deleted etc) and getting "theirs" version for all
