Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
teknikattan-scoring-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tddd96-grupp1
teknikattan-scoring-system
Commits
23d00999
Commit
23d00999
authored
3 years ago
by
Josef Olsson
Browse files
Options
Downloads
Patches
Plain Diff
Fix minor mistake
parent
f3c5004f
No related branches found
Branches containing commit
No related tags found
1 merge request
!159
Resolve "Documentation"
Pipeline
#46206
passed with warnings
3 years ago
Stage: setup
Stage: test
Stage: report
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
README.md
+1
-1
1 addition, 1 deletion
README.md
with
1 addition
and
1 deletion
README.md
+
1
−
1
View file @
23d00999
...
...
@@ -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).
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment