Modeling with xtUML · Module 5 · Unit 12
Merging Changes and Conflict Resolution in a Model File
Sometimes when merging with remote branches conflicts occur.
This video shows how to use the Merge tool to merge model conflicts.
After completing this video and successfully passing the associated quiz, if you would like a more in-depth video that discusses xtUML model compare and merge, the following video is available: Comparing and Merging with git in xtUML Editor.