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

response

Browse source
This commit is contained in:
Joey Hess 2015-09-21 12:54:16 -04:00
parent 0bf431745d
commit d3af2bd64f
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
doc/forum/HowTo_Conflict_Resolution/comment_1_81c06a0590ee828749b8d07e008028bb._comment Normal file
View file

@ -0,0 +1,19 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2015-09-21T16:49:43Z"
content="""
The "variant" names are based on a short hash of the key
of the file, so there's no way to get from such a name back to the
repository that the file was added to.
What you can do is, look at the `git log --stat`, and find
the two conflicting commits, and use git to either revert back to one of
the two, or reset back to before the automatic merge and manually
merge the two.
(Of course, this all works best when the repository is
in indirect mode and you can use any git commands you like to slice and
dice it. When the repo is direct mode, you might be able to run those
same git commands via `git annex proxy`)
"""]]