Problems resolving conflicts with SVN

General Discussion Related to Stellar Conflicts
Posts: 22
Joined: Wed Mar 21, 2018 8:52 am

Problems resolving conflicts with SVN

Postby kevinmanuel » Fri Apr 27, 2018 8:16 am


I occasionally have problems with source control conflict resolution in Flare, and would appreciate some feedback on the best approach. Details are as follows:
- I'm running Flare 11
- I work with one other author
- We work on different areas of the system, but occasionally on the same topics
- When conflicts arise, meaning that a topic I'm editing can't be checked in, I've tended to use the Flare source control functionality to merge changes or to revert, and whilst I probably don't do it in a very consistent way, it has seemed to work
- Sometimes, though, it doesn't work and the conflicts remain, even when I've used the Flare interface to discard my changes in favour of my colleague's. In that situation, the revert seems to work, but when I make a change to the topic and try to check it back in the conflicts come back. In some cases, I've deleted the file and recreated it to resolve the issues.
Has anyone else experienced similar issues, and do you have a strategy for handling them?

Any help will be apprecited.

I didn't find the right solution from the Internet.

References: ... 68&t=21854
Animated video production service

Thank you.

Return to “General Discussion”

Who is online

Users browsing this forum: No registered users and 3 guests