summaryrefslogtreecommitdiff
path: root/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn')
-rw-r--r--doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn b/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn
index b303c617e..9b71b4cf1 100644
--- a/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn
+++ b/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn
@@ -69,3 +69,5 @@ It is quite possible some files were removed (or renamed!) on `marcos` but not o
This will show files that are on `angela` and not on `marcos`. They could be new files that were only added on `angela`, so be careful! A manual analysis is necessary, but let's say you are certain those files are not relevant anymore, you can delete them from `angela`:
git annex drop <file>
+
+If the file is a renamed or modified version from the original, you may need to use `--force`, but be careful! If you delete the wrong file, it will be lost forever!