When i do Team -> Pull on my project
I have result Failed, then below merge input i have tow modification but none of them is impacting the same file, so there is no conflicts.
Why is this showing as failed? Is this a bug?
Share
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 do Team -> Pull on my project
I have result Failed, then below merge input i have tow modification but none of them is impacting the same file, so there is no conflicts.
Why is this showing as failed? Is this a bug?
I just did a Team -> Reset.
I choose “Mixed” (head and index) and looks like it’s working.
(But i don’t know if it’s the best way)