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 fi
The solution I found that caused me the least headaches:
git checkout git checkout -b dummy git merge git checkout git checkout dummy
After doing that the file in path to file in b2 is what it would be after a full merge with b1.
path to file
b2
b1