Skip to content
Snippets Groups Projects
Commit 23d00999 authored by Josef Olsson's avatar Josef Olsson
Browse files

Fix minor mistake

parent f3c5004f
No related branches found
No related tags found
1 merge request!159Resolve "Documentation"
Pipeline #46206 passed with warnings
......@@ -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).
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment