MadCap Software Forums

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

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!