From: Ian Kelling <iank@fsf.org>
Date: Wed, 27 Apr 2022 02:45:59 +0000 (-0400)
Subject: document upstream merge
X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=commitdiff_plain;h=79412de6a29f5c34af2934f51a541c312332bb69;hp=051fc89e27bd812a1a45292f6d2a18803ce6f394

document upstream merge
---

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