Is it possible to explicitly tell git during a merge that a certain file has been renamed or moved?
The background is that I have done a refactoring where a certain class has been generalized so that instead of having one class called "MyClass", I now have two classes "MyClassBase" and "MyClass". Almost all the logic in "MyClass" has been moved to "MyClassBase" but a virtual method has been added that "MyClass" implements.
"MyClassBase" and "MyClass" reside in separate files ("MyClassBase.cs" and "MyClass.cs"), and are the only classes in their respective files.
Now the problem is that when I do a merge, I get a lot of conflicts in "MyClass.cs" as there has been changes in that class on master. But If I were somehow able to tell git that the changes for the file "MyClass.cs" on master should really be merged into the file "MyClassBase.cs", then the merging would be almost trivial.