From 56403c6708d6e275128ec7d499a4c80fdca3cb0f Mon Sep 17 00:00:00 2001
From: Jacques Dainat <jacques.dainat@ird.fr>
Date: Thu, 14 Nov 2024 12:16:57 +0100
Subject: [PATCH] update schedule
---
docs/pages/course-information/schedule.md | 67 +++++++++++++++++++----
1 file changed, 56 insertions(+), 11 deletions(-)
diff --git a/docs/pages/course-information/schedule.md b/docs/pages/course-information/schedule.md
index 8bafe05..280c2d2 100644
--- a/docs/pages/course-information/schedule.md
+++ b/docs/pages/course-information/schedule.md
@@ -7,28 +7,73 @@
</tr>
</thead>
<tr>
- <td style="padding:5px"> <font size="3"> 15 min </td>
+ <td style="padding:5px"> <font size="3"> 9:00 am min </td>
<td style="padding:5px"> <font size="3"> Setting up </td>
</tr>
<tr>
- <td style="padding:5px"> <font size="3"> 1h 15 </td>
- <td style="padding:5px"> <font size="3"> Distributing and version tracking your code
- <font size="2"><i><br>
- - Introduction to version control and Git <br>
- - Practical tutorial: Git <br>
+ <td style="padding:5px"> <font size="3"> 9:15 am </td>
+ <td>Lecture
+ <font size="2"><i><br> Introduction to version control and Git <br>
</td>
</tr>
<tr>
- <td style="padding:5px"> <font size="3"> 15 min </td>
+ <td style="padding:5px"> <font size="3"> 09:45 am </td>
+ <td>Git training
+ <font size="2"><i><br>
+ Creating a git repository <br>
+ Committing changes <br>
+ </td>
+ </td>
+ </tr>
+ <tr>
+ <td style="padding:5px"> <font size="3"> 10:15 am </td>
<td style="padding:5px"> <font size="3"> Break </td>
</tr>
<tr>
- <td style="padding:5px"> <font size="3"> 1h 15 min </td>
- <td style="padding:5px"> <font size="3"> ... continued: Git tutorial </td>
+ <td style="padding:5px"> <font size="3"> 10:30 am </td>
+ <td>Git training
+ <font size="2"><i><br>
+ Committing changes... (continuing) <br>
+ Undoing and recovering changes <br>
+ Ignoring files <br>
+ Branching and merging <br>
+ </td>
+ </tr>
+ <tr>
+ <td style="padding:5px"> <font size="3"> 12:00 pm </td>
+ <td style="padding:5px"> <font size="3"> Lunch Break </td>
+ </tr>
+ <tr>
+ <td style="padding:5px"> <font size="3"> 1:30 pm </td>
+ <td>Git training
+ <font size="2"><i><br>
+ Branching and merging... (continuing) <br>
+ Tagging commits<br>
+ Working remotly<br>
+ Conflict
+ </td>
+ </tr>
+ <tr>
+ <td style="padding:5px"> <font size="3"> 3:00 am </td>
+ <td style="padding:5px"> <font size="3"> Break </td>
+ </tr>
+ <tr>
+ <td style="padding:5px"> <font size="3"> 3:15 pm </td>
+ <td>Git GUI
+ <font size="2"><i><br>
+ Rstudio<br>
+ Vscode<br>
+ </td>
+ </tr>
+ <td style="padding:5px"> <font size="3"> 4:45 pm </td>
+ <td>Wrap-up Git tutorial
+ <font size="2"><i><br>
+ One word on licences<br>
+ </td>
</tr>
<tr>
- <td style="padding:5px"> <font size="3"> 15 min </td>
- <td style="padding:5px"> <font size="3"> Wrap-up Git tutorial </td>
+ <td style="padding:5px"> <font size="3"> 17:00 am </td>
+ <td style="padding:5px"> <font size="3"> The END </td>
</tr>
</table>
--
GitLab