Disable Git Rename Detection

Question

1. I have a file, foo.txt
2. Create and checkout branch \'branch_A\'
3. git mv foo.txt bar.txt followed by git add -A t

Answer 1

Can you try with:

git merge -s resolve branch_A

Also, have you tried looking at similar questions here:

git rename/delete confusion

git divergent renaming