When merging, I often have modified code that is now "deleted". However it may have been moved somewhere else. How can I find out where?
Example: I change one line in a function
Assuming your branch is
mybranch and the main tree is
master, you could do
git diff mybranch...master. This will show you all changes between the two branches using their nearest common ancestor commit as a reference point.
In the diff, you can search for your file to see what happened to it.
For more details see
git help diff.