diff --git a/how-to-merge-after-rename.txt b/how-to-merge-after-rename.txt new file mode 100644 index 0000000000000000000000000000000000000000..f41ed1c575550956cfeffeecd29f945e1fb446d7 --- /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