File: What_can_be_done_in_case_of_conflict.mdwn

package info (click to toggle)
git-annex 5.20141125
  • links: PTS
  • area: main
  • in suites: jessie, jessie-kfreebsd
  • size: 37,828 kB
  • ctags: 583
  • sloc: haskell: 42,582; sh: 1,080; ansic: 498; makefile: 316; perl: 125
file content (7 lines) | stat: -rw-r--r-- 205 bytes parent folder | download | duplicates (12) 
1
2
3
4
5
6
7
 
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