Is there a git merge strategy that copes with significant code movement? -

in branch, moved 90% of methods 1 test class another.

in main branch, added 1 method class moved code out of.

then went downmerge; our convention merge main branch work branch before going other way. used:

git pull origin develop 

the resulting merge created file containing code had removed. have expected 3-way merge apply, have 'kept' deletion , other branch's addition. had manually re-edit rid of classes i'd deleted 'origin' class. of course, had manually move 1 new method; no objection there.

is there alternative git merge strategy might have recognized meant?

i suggest to:

git pull --rebase origin develop 

this puts local commits on top of remote commits.