forum/What can be done in case of conflictgit-annexhttp://git-annex.branchable.com/forum/What_can_be_done_in_case_of_conflict/git-annexikiwiki2013-11-27T22:47:37Zcomment 1http://git-annex.branchable.com/forum/What_can_be_done_in_case_of_conflict/comment_1_5ca86b099dfa08a50f656ea03bf1dcd9/joey2013-11-27T22:47:37Z2012-04-23T14:29:03Z
<p>You handle conflicts in annexed files the same as you would handle them in other binary files checked into git.</p>
<p>For example, you might choose to <code>git rm</code> or <code>git add</code> the file to resolve the conflict.</p>
<p><a href="http://git-annex.branchable.com/forum/A_really_stupid_question/">Previous discussion</a></p>
Resolving conflicthttp://git-annex.branchable.com/forum/What_can_be_done_in_case_of_conflict/comment_3_017f4bac57a040c496e0c9d068dcfd9e/Royal2013-11-27T22:47:37Z2012-04-23T15:49:30Z
<p>Thanks for the reply.</p>
<p>I am executing the following commands.</p>
<p>git init main
cd main
git annex init main
echo a > a
git annex add a
git commit -m Initial
git annex unlock a
echo aa > a
git annex add a
git commit -m first
git annex unlock a
echo aaa > a
git annex add a
git commit -m second
git log
git cherry-pick </p>
<hr />
<p>Error:</p>
<p>error: could not apply 2be8f38... first
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'</p>
<p>How can resolve the the above conflict.
If I see the content of the file I will get the content of second commit.
Is there any way I can get the content for first commit(Like in git we have 'theirs' option.)</p>
<p>Thank you.</p>
Resolving conflicthttp://git-annex.branchable.com/forum/What_can_be_done_in_case_of_conflict/comment_2_69ee17959a92bb8359c0fd7b2a9d8dfb/Royal2013-11-27T22:47:37Z2012-04-24T03:59:31Z
<p>Hi,
Now I am able to resolve the conflict.
Thank you.</p>