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 rm or git add the file to resolve the conflict.
git rm
git add
Previous discussion
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 rm
orgit add
the file to resolve the conflict.Previous discussion