diff options
author | 2015-01-05 16:22:32 -0400 | |
---|---|---|
committer | 2015-01-05 16:22:32 -0400 | |
commit | 404c401750b8d719b722993ba05d5bcc6cd5b0b8 (patch) | |
tree | b556a254b11568e3aac47dd0f31338fa7b8c5ad1 | |
parent | 68638f359a64b377d77677f60a8c49fe20bb8670 (diff) |
comment
-rw-r--r-- | doc/forum/Remove_variants_from_all_repositories___40__and_possibly_restore_the_original_naming__41__/comment_1_dfc64d8618e07177bb196d9af4474698._comment | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/doc/forum/Remove_variants_from_all_repositories___40__and_possibly_restore_the_original_naming__41__/comment_1_dfc64d8618e07177bb196d9af4474698._comment b/doc/forum/Remove_variants_from_all_repositories___40__and_possibly_restore_the_original_naming__41__/comment_1_dfc64d8618e07177bb196d9af4474698._comment new file mode 100644 index 000000000..7f3105890 --- /dev/null +++ b/doc/forum/Remove_variants_from_all_repositories___40__and_possibly_restore_the_original_naming__41__/comment_1_dfc64d8618e07177bb196d9af4474698._comment @@ -0,0 +1,19 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2015-01-05T20:12:56Z" + content=""" +Probably the best thing to do is to use `git log --stat` +to find the commits that were made on the remote that added the conflicting +files. Also find the merge commit that created the variant +files. You can then `git revert` the merge commit, and follow up by `git +revert` the commits that added the conflicting files. This will bring your +working tree back to the state it was in originally. + +Alternatively, if your current repo has the contents present for +the variants of the files you want to keep, while the remote repos contain +the contents of the variants you want to delete, you could use this command +to delete the variants that don't have their contents in the local repo: + + git annex find --include='*.variant-*' --not --in here --print0 | xargs -0 rm +"""]] |