Managing changes in documentation content between solution documentation branches

[kollabathulas21]

I have a question regarding documentation conflicts especially when we change a document in two different branches.

This is the scenario I am interested to know.

Scenario 1: A Document named "XYZ" has modified in Maintenance branch, 1 paragraph is added and paragraph 2 is deleted. No other attributes are changed. the document is then released to production.

In the development branch a fresh development is using this document and Paragraph 3 and 4 were added.

Question1: If the changes in maintenance branch to document XYZ were released into production branch First, will Paragraph 1 addition and paragraph 2 deletion show up in document XYX in Development branch.

-Srini

[kollabathulas21]

yeah I get the same thing and if the document content is changed in both branches how can the conflict be resolved. Should we loose the changes in one branch in order to solve the conflict.

It could be nice if we are warned before making a change in either branch about impending conflict.

-Srini

[Sharath_vuppula]

Hi Srini,

Yes, when I tried this I was asked to resolve conflicts while releasing the document from maintenance branch.

Regards,

Sharath