manual_teachbooks/book/workflows/git-merge-conflict.md
Caspar Jungbacker c6422ba8d1 Add sections
- GitLab merge requests
- Dummy sections on merge conflicts
2023-04-28 17:30:27 +02:00

4 lines
No EOL
57 B
Markdown

(merge-conflicts)=
# Merge conflicts
Under construction.