Modeling with xtUML · Module 5 · Unit 11
Merging Changes and Conflict Resolution in a Text File
Sometimes when merging with remote branches conflicts occur.
This video shows how to resolve merge conflicts using the eGit Staging view.
Modeling with xtUML · Module 5 · Unit 11
Sometimes when merging with remote branches conflicts occur.
This video shows how to resolve merge conflicts using the eGit Staging view.