diff options
| author |  http://joeyh.name/ <http://joeyh.name/@web> | 2014-06-16 17:58:22 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-06-16 17:58:22 +0000 |
| commit | ab7af14859be89d2b94cb6d53d689676e9ca6ac0 (patch) | |
| tree | 819fb9a45429a5a4908a8d3c4ffdd06731f2c450 | |
| parent | 47dcaf3f54a6c61b988c8aed60d32292dd8c290a (diff) | |
Added a comment
| -rw-r--r-- | doc/forum/recovery_from_failed_merge/comment_1_84e5b55d473d16bc9bdba5d88dc29bc3._comment | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/forum/recovery_from_failed_merge/comment_1_84e5b55d473d16bc9bdba5d88dc29bc3._comment b/doc/forum/recovery_from_failed_merge/comment_1_84e5b55d473d16bc9bdba5d88dc29bc3._comment new file mode 100644 index 000000000..3f61d8cb9 --- /dev/null +++ b/doc/forum/recovery_from_failed_merge/comment_1_84e5b55d473d16bc9bdba5d88dc29bc3._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="108.236.230.124" + subject="comment 1" + date="2014-06-16T17:58:22Z" + content=""" +All your files are still there.. + +You can either use `git annex indirect` to switch to indirect mode and then `git revert`, or you could git clone the repo to someplace else, do the revert there, and then run `git annex sync` in first the clone and then in the direct mode repo to sync the reversion back. +"""]] |