Commit 67de5ae4 authored by simokron's avatar simokron
Browse files

Conflict test

parent 7d313b33
......@@ -81,4 +81,6 @@ In the colloquium on October 23, 2019, we present you with the basics of Git in
The vast majority of CASA members do not use content trackers to store computer files. Especially in software management and group projects, the importance of version control systems for tracking changes cannot be overstated. Version control systems are software tools that help a team or individual manage changes to source code and other files over time. In this colloquium and on the upcoming CASA Day, we introduce you to Git, the mainstream version control systems. Originally designed for coordinating work among programmers it is now used to track changes in any set of files. Git has a remote repository on a server and a local repositories on each team member's computer. This means that the code is not just stored in a central server, but a full copy of the code is present on multiple computers. We will teach you how changes on individual computers can be monitored with one single remote repository.\\
This is a test
\end{document}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment