Merge pull request #940 from swcarpentry/conflict-glossary

add link to conflict in glossary
swcarpentry · Nov 20, 2023 · cebcfe1 · cebcfe1
2 parents 131764e + a8b283f
commit cebcfe1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/episodes/01-basics.md b/episodes/01-basics.md
@@ -47,7 +47,8 @@ sets of changes on the same document.
 
 ![](fig/versions.svg){alt='Different Versions Can be Saved'}
 
-Unless multiple users make changes to the same section of the document - a conflict - you can
+Unless multiple users make changes to the same section of the document - a 
+[conflict](../learners/reference.md#conflict) - you can
 incorporate two sets of changes into the same base document.
 
 ![](fig/merge.svg){alt='Multiple Versions Can be Merged'}