How do I recognize a conflict that occurs when updating packages through Monticello?
When you have selected a package to update and pressed the “merge” button, after some diffing another “Merging (packageName)” window normally comes up which lists the actual changes that will happen. If there is a conflict, the “merge” button in this new window will be ghosted out and there will be one or more changes listed that are bolded, which are the conflicting changes.