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

One of the issues we've run across is that the git PR process adds lines of text related to the PR to the Flare source file. The following new lines encompass the modified content: <<<<<<< HEAD , >>>>>>> parent of <PR commit, including the commit comment> ; </html> is added at the end of the file. ...

I found this thread via Google; it was the one and only result of a Google search for " Remote already contains another project. Please pull from an empty remote. " What triggered the message in my case was a more basic user error, related (I think) to feature branch creation from within ...

I'm happy to talk more if you have more questions! If you can't tell, I really love Git! Hi! My team is currently exploring git and using branches in much the way you describe. One issue we haven't quite figured out is how to do reviews before we publish to live. Right now we have a single test sit...