"Conflicts that require resolution"

This forum is for all Flare issues related to using Source Control.

"Conflicts that require resolution"

Postby DahcNosserb on 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.
DahcNosserb
Propeller Head
 
Posts: 16
Joined: Thu Sep 07, 2017 10:46 am

Re: "Conflicts that require resolution"

Postby peterb on Tue Aug 20, 2019 4:07 pm

I would like to res this thread because I am having this exact user experience. Prompted to resolve a conflict prior to pushing to Bitbucket, Yes and No buttons do nothing. Where can one manually seek out and resolve these conflicts so that source control functionality is restored? Thanks!
peterb
Propeller Head
 
Posts: 22
Joined: Tue Mar 21, 2017 12:46 pm

Re: "Conflicts that require resolution"

Postby Gecko on Sun Dec 15, 2019 3:42 pm

Bump for this question pls
Gecko
Jr. Propeller Head
 
Posts: 2
Joined: Sun Jul 14, 2019 8:28 pm

Re: "Conflicts that require resolution"

Postby doloremipsum on Mon Dec 16, 2019 3:10 pm

I don't know about BitBucket in particular, but try the commit window if such a thing exists? There might be a little 'merge conflicts' flag up the top that should hopefully open the merge dialogue.
neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit - sed saepe cum dolor apud multos callidos mutuetur, reduci potest.
doloremipsum
Propeller Head
 
Posts: 68
Joined: Mon Aug 26, 2019 2:11 pm


Return to Source Control

Who is online

Users browsing this forum: No registered users and 2 guests