Heads up! To view this whole video, sign in with your Courses account or enroll in your free 7-day trial. Sign In Enroll
Start a free Courses trial
to watch this video
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.
Further reading
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.
Resources
Related Discussions
Have questions about this video? Start a discussion with the community and Treehouse staff.
Sign upRelated Discussions
Have questions about this video? Start a discussion with the community and Treehouse staff.
Sign up
You need to sign up for Treehouse in order to download course files.
Sign upYou need to sign up for Treehouse in order to set up Workspace
Sign up