Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I have two files A and B in master. I created a branch feature where I modified both A and B. Then, someone else deleted B and renamed A to B in master (using git mv).
When I merge feature into master, git compares B in feature with B in master, which is not as what I expected, because the content of B is actually the content of A in master.
Is there any built-in feature that can link A in feature with B in master when I merge it?
rename the file to match in either side or change the threshold percentage until git sees them as the same file. I believe it’s the
-Moption.