There are ways to make some merge or rebase decisions simpler with git, get either our changes or their changes. This is not recommended unless you are really sure, and other times, your file is encrypted and you can’t really handle diffs in the file properly for that I like to do this approach:
git checkout --ours <file>
If you are very sure you just want what the other branch have, there are git strategies now
git rebase --strategy-option=theirs for example.