Hardening files to prevent merge conflicts

This forum is for all Flare issues related to using Source Control.
Post Reply
TimElhajj
Jr. Propeller Head
Posts: 4
Joined: Mon Aug 28, 2017 3:21 pm

Hardening files to prevent merge conflicts

Post by TimElhajj »

I work on a team with multiple writers all using the same repo.

I notice I often get merge conflicts in the TOC when I merge feature branch (with changes to the TOC) back into master. I'm wondering if using nested TOCs would help with merge conflicts? It seems like it would because with nested TOCs, changes might be more isolated in feature branches.

Are others using source control with multiple writers working in feature branches and uploading to a single branch to do publish? If so, have you had similar problems with the TOC and will using nested TOCs help make the TOC less prone to merge conflicts?

Is there a way to test if the new structure is less prone to merge conflict (beyond just trying it out I mean).
ChoccieMuffin
Senior Propellus Maximus
Posts: 2630
Joined: Wed Apr 14, 2010 8:01 am
Location: Surrey, UK

Re: Hardening files to prevent merge conflicts

Post by ChoccieMuffin »

Just looking logically, having nested TOCs sounds like the way to go. If you go down that route, when you're working on sub-TOC A and another writer is working on stuff in Sub_TOC B, the main TOC that contains links to both sub-TOCs won't change.

I use this approach in a couple of our monster projects and it works well, and I also have sub-folders in the Content Explorer so I can find things more easily.
Started as a newbie with Flare 6.1, now using Flare 2023.
Report bugs at http://www.madcapsoftware.com/bugs/submit.aspx.
Request features at https://www.madcapsoftware.com/feedback ... quest.aspx
Post Reply