diff --git a/README.md b/README.md index 0086108493093145fd30aa2189a74bd39f0ae44b..e0a31a75a25b28a1aca3dac9dd2e9a8b0a1f678b 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ You cannot approve your own merge requests but once it's approved anyone can mer ### Merge conflicts You will need to manually merge if there is a merge conflict between your branch and another. -This is simply done by opening the project in and going to the Git tab on the left (git symbol). +This is simply done by opening the project in VS Code and going to the Git tab on the left (git symbol). You will then see som files marked with `C`, which indicates that there are conflicts in these files. You will have to go through all of the merge conflicts and solve them in each file. A merge typically looks like the code snippet at the bottom of this document in plain text (try opening this in VS Code and see how it looks).