blob: 42167a6091f7fb90e4548eb540cdf58425f9ad2c (
plain)
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
|