Online conflict resolution panel not working.

When working with the online conflict resolution panel you might encounter issues like panels not loading for some specific components or incorrect content in the panels, for example, more lines than expected.

These issues might occur when the components returning conflicts contain the characters that are used by Git to mark the conflicts. Git marks the conflicts with the following combination or characters:

"<<<<<<< HEAD"    
"======="
">>>>>>>"

If you are facing the issues above, make sure your components don't contain the exact combination of characters above or a similar combination with more characters.

This will cause issues:

"<<<<<<< HEAD"
"<<<<<<<<<<< HEAD"
"======="
"============"
">>>>>>>"
">>>>>>>>>>>>"

This will work:

"<<< HEAD"    
"==="
">>>"

How did we do?