Where can I find my conflicts

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

Where can I find my conflicts

Postby adrianaharper on Tue Jul 18, 2017 1:02 pm

Hi everyone,

I'm using Flare with GIT; and I am being told that I have a conflict when I try to push/pull files. However, I have no idea what that conflict is (which file) - where can I see my conflicts, to resolve them?

TIA,
Adriana
adrianaharper
Propeller Head
 
Posts: 26
Joined: Tue Apr 21, 2015 9:27 pm

Re: Where can I find my conflicts

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

I am with you, Adriana, if you are still there. I am told that I have a conflict, but I cannot resolve the conflict through taking action on that error message, and I cannot manually find my conflicts in Flare in order to resolve them. I am in need of help in this situation as well. Thanks!
peterb
Propeller Head
 
Posts: 17
Joined: Tue Mar 21, 2017 12:46 pm


Return to Source Control

Who is online

Users browsing this forum: No registered users and 1 guest