Skip to content
Snippets Groups Projects
Select Git revision
  • 6e20e12dfcf20ea976e0b4df5ffade3a7b455ecd
  • main default protected
  • f-remove-deprecation-warning
  • dev
  • f-docs-pylib
  • f-parse-value
  • f-compare
  • f-string-ids
  • f-217-set-special-property
  • f-filesystem-import
  • f-filesystem-link
  • f-filesystem-directory
  • f-filesystem-core
  • f-filesystem-cleanup
  • f-check-merge-entities
  • f-compare-enid
  • f-select-subproperties
  • v0.18.0
  • v0.17.0
  • v0.16.0
  • v0.15.1
  • v0.15.0
  • v0.14.0
  • v0.13.2
  • v0.13.1
  • v0.13.0
  • linkahead-rename-step-2
  • linkahead-rename-step-1
  • v0.12.0
  • v0.11.2
  • v0.11.1
  • v0.11.0
  • v0.10.0
  • v0.9.0
  • v0.8.0
  • v0.7.4
  • v0.7.3
37 results

how-to-merge-after-rename.txt

Blame
  • Code owners
    Assign users and groups as approvers for specific file changes. Learn more.
    how-to-merge-after-rename.txt 344 B
    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