The Visual Studio Code editor enables you to remove merge conflicts similar to the GitHub.com UI.
To see the Visual Studio Code merge conflict tool in action, perform the following:
If you already completed all of the exercises in this course, you can re-import the course repository and give it a different name.
- Clone the repository locally.
- Checkout to the
In the terminal, open Visual Studio Code using the
Depending on your operating system, you may need to configure this behavior.
- Edit the
_config.ymlfile, making changes to lines 12-19 and save the file.
- Create a commit based on those changes.
- Checkout the
git merge username-configwhile on the
masterbranch. You will encounter a merge conflict.
If there are multiple files within the merge, you can type
git statusto see which file (or files!) is causing the conflict.
- Open the
_config.ymlfile with Visual Studio Code.
- Remove the merge conflict markers and the content you do not want to keep.
git add _config.ymlfollowed by
git commit -m "Add my config changes"and enter enter.
- Congratulations, you resolved a merge conflict locally with the Visual Studio Code editor!