Git merge 2 new file with removed content and added content
- by Loïc Faure-Lacroix
So we are working in with 2 different repositories and both designers modified the same file.
the problem is quite simple but I have no ideas how to solve it yet. Both files are marked as new since they have almost nothing in common except that file.
When I try to merge from branch A to B it mark the parts added in A deleted in B and on the…