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.
When I’m trying to merge Git says:
foo.txt deleted in HEAD and modified in release
Actually, I didn’t delete foo.txt in my branch, but moved it to a new place, a few times. I suspect that Git lost this multiple movement information and now thinks that I deleted the file and created a new one somewhere else.
Can I somehow inform Git where the file is located now?
This is how I solved the problem:
I applied all my changes to the master branch, one by one, resolving conflicts incrementally.