Learning outcomes
- Explain how to understand and resolve competing changes.
- Complete the guided activity safely.
- Check that you can preserve the intended result.
Git and GitHub
Merge Conflicts
Learn to understand and resolve competing changes and preserve the intended result in this beginner-friendly Visual Studio Code lesson.
Before you begin
Use a non-sensitive practice folder, inspect unfamiliar code before trusting it, and never place passwords, tokens or private information in project files.
Step-by-step instructions
- Open the intended practice workspace in Visual Studio Code and confirm its folder name and Workspace Trust state.
- Review a fictional conflict marker set.
- Save the relevant files and review the Problems panel, terminal, Source Control view or browser preview as appropriate.
- Check filenames, relative paths, console messages, keyboard use, mobile layout and privacy before continuing.
- Confirm that you can preserve the intended result, then create a clear commit, backup or saved checkpoint.
Ian's practical tip: Work in one named project folder, preview after small changes, read the actual error message and keep a recoverable version before broad edits.
Practical activity
Review a fictional conflict marker set. The expected result is to preserve the intended result.