This commit is contained in:
parent
cd8934e4a2
commit
450201dcee
1 changed files with 7 additions and 0 deletions
7
doc/forum/What_can_be_done_in_case_of_conflict.mdwn
Normal file
7
doc/forum/What_can_be_done_in_case_of_conflict.mdwn
Normal file
|
@ -0,0 +1,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
|
Loading…
Add table
Add a link
Reference in a new issue