From 8de757e6e717ba30625bcc8f225a07a9fb232f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Fri, 6 Oct 2023 18:16:30 +0200
Subject: [PATCH] DOC: add tips how to deal with renaming conflicts

---
 how-to-merge-after-rename.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 how-to-merge-after-rename.txt

diff --git a/how-to-merge-after-rename.txt b/how-to-merge-after-rename.txt
new file mode 100644
index 00000000..f41ed1c5
--- /dev/null
+++ b/how-to-merge-after-rename.txt
@@ -0,0 +1,11 @@
+git merge linkahead-rename-step-1
+# resolve potential conflicts and commit
+rm -rf src/linkahead
+git mv src/caosdb/ src/linkahead
+rm -rf src/caosdb
+python3 create_slim_linkahead_wrapper.py
+git add src
+git ci -m "MAINT: rename caosdb to linkahead (module)"
+git merge linkahead-rename-step-2
+# resolve potential conflicts and commit
+git merge dev
-- 
GitLab