Definitions for "Resolving"
Conflicts within a file created by two developers attempting to commit conflicting changes must be addressed by manually editing the file. Someone must go through the file line by line to accept one set of changes and delete the other set. Files with conflicts cannot be committed into the source repository successfully until they are resolved.
Translating a textual domain name into a numeric IP Address. A browser will translate a domain name into its IP Address, a number designating the server where the files for the domain name are kept.
Keywords:  analysis, clear, cut, components
analysis into clear-cut components