MadCap Software Forums

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).

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.