Menu
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?
283
A merge conflict is a scenario where Git is not able to automatically merge changes as it gets confused between two different versions of code for the same file.
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)
124
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
