From 33a3cf3b5702f0e55d0638cb867fd87a3b1d663a Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sun, 14 Jul 2024 17:29:13 -0700
Subject: [PATCH] restore this activity for 2024

---
 assignments/ReportingForDuty.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/assignments/ReportingForDuty.md b/assignments/ReportingForDuty.md
index b9511a38f3..cd4714615c 100644
--- a/assignments/ReportingForDuty.md
+++ b/assignments/ReportingForDuty.md
@@ -2,6 +2,8 @@
 
 Everyone in the course is hereby requested to make a change to this file.  This confirms your ability to use NetBeans and your gitlab.nps.edu account.
 
+Note how when we collaboratively use git together, we can typically avoid any version collisions.  If mismatch problems do occur, we can use git tools to reconcile them.
+
 Be sure to *git update* before, and be sure to *git commit* and *git push* after!
 
 More information on your use of Git is in the parent directory [README.md](../../README.md)
@@ -10,6 +12,18 @@ More information on your use of Git is in the parent directory [README.md](../..
 
 ---
 
+### 2024
+
+- who is next?
+
+---
+
+### 2022, 2023
+
+- oops.  this task used to be nontrivial, hopefully now it is easy
+
+---
+
 ### 2021
 
 - Terry is here!
-- 
GitLab