I have been trying to check-in a topic. It says that there are conflicts. While trying to resolve the conflicts, it asks to auto merge. While trying to auto merge, it says as there are conflicts, cannot auto-merge. The progress window appears for a second and disappears. Unable to add/check in a topic. Solution please.
TIA.
Getting check in issues
-
doloremipsum
- Sr. Propeller Head
- Posts: 290
- Joined: Mon Aug 26, 2019 2:11 pm
Re: Getting check in issues
What source control are you using? Is there an interface for it outside of Flare that you can open to try resolve the conflicts there?
in hoc foro dolorem ipsum amamus, consectimur, adipisci volumus.