mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

comment

Browse source
This commit is contained in:
Joey Hess 2015-01-05 16:22:32 -04:00
parent dfca751998
commit cef498c2c2
1 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
doc/forum/Remove_variants_from_all_repositories___40__and_possibly_restore_the_original_naming__41__/comment_1_dfc64d8618e07177bb196d9af4474698._comment Normal file
View file

@ -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
"""]]