I have 2 git branches branch1 and branch2 and I want to merge file.py in branch2 into file.py in branch1 and only that file.
In essence I just want to work on the file.py in branch1 but want to take advantage of the merge command. What is the best way to do this?