From 79412de6a29f5c34af2934f51a541c312332bb69 Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Tue, 26 Apr 2022 22:45:59 -0400
Subject: [PATCH] document upstream merge

---
 README | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 3f01a97..4bbcc87 100644
--- a/README
+++ b/README
@@ -307,7 +307,21 @@ s apt-get update
 s apt dist-upgrade
 
 
-
+### How to merge upstream fai-config
+
+git checkout upstream
+cd path-to-fai-config
+git pull --stat
+# the following needs modification if there was deletions or renames
+rsync --exclude /.git -rlpgoDcvi . /b/fai/fai/config/
+cd /b/fai/fai/config/
+# where XXXXX is the git commit hash
+# note, several files which just had trailing space changes will get ignored.
+git commit -am "update upstream to XXXXX"
+git checkout master
+git merge upstream
+# fix conflicts
+git commit
 
 
 # TODO
-- 
2.30.2