Hi,
How can I resolve the conflict when it occurs?
Suppose I have 2 branches (master, current), When I merge these branches or while doing cherry-pick, if I get conflict how can I resolve it?
Thank You
Hi,
How can I resolve the conflict when it occurs?
Suppose I have 2 branches (master, current), When I merge these branches or while doing cherry-pick, if I get conflict how can I resolve it?
Thank You
You handle conflicts in annexed files the same as you would handle them in other binary files checked into git.
For example, you might choose to
git rmorgit addthe file to resolve the conflict.Previous discussion
Thanks for the reply.
I am executing the following commands.
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
Error:
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'
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.)
Thank you.
Hi, Now I am able to resolve the conflict. Thank you.