When working with collaborators they might push a change to your remote branch while you are working on the same file locally, resulting in a conflict. You will learn to create, and then fix, a merge conflict.
Keywords for Conflict Resolution:
Close, Fix, and Resolve
You can use the Issue Title to close issues. Using the above keywords along with the issue number can be used to close issues via commit messages. More info can be found in the GitHub help documents.
You need to sign up for Treehouse in order to download course files.Sign up