"Conflicts that require resolution"
Posted: Mon Sep 25, 2017 8:45 am
I've been getting an error message every time I attempt to push, pull, or synchronize to Bitbucket. "You have 1 conflicts that require resolution prior to pushing (pulling, synchronizing). Do you want to resolve them now?" Clicking on either the "yes" or "no" buttons does absolutely nothing. I am not given any further helps or instructions or another question. I'm guessing I have to find the conflict on my own?
I also wonder why the error prompts for a question if I have no real choice in the matter. Why does it not simply tell me I need to resolve a conflict before I can proceed with source control without asking the "yes" or "no" question?
Thanks.
I also wonder why the error prompts for a question if I have no real choice in the matter. Why does it not simply tell me I need to resolve a conflict before I can proceed with source control without asking the "yes" or "no" question?
Thanks.