diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ <Royal@web> | 2012-04-23 04:03:17 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2012-04-23 04:03:17 +0000 |
| commit | 450201dcee2bd0900cf29da4ddf04a41457e3662 (patch) | |
| tree | 17f39bbf674e93c8418956e70cb9bb791bfaed25 | |
| parent | cd8934e4a2268431d4cc5dc8e665cf5303dfdb46 (diff) | |
| -rw-r--r-- | doc/forum/What_can_be_done_in_case_of_conflict.mdwn | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/forum/What_can_be_done_in_case_of_conflict.mdwn b/doc/forum/What_can_be_done_in_case_of_conflict.mdwn new file mode 100644 index 000000000..42167a609 --- /dev/null +++ b/doc/forum/What_can_be_done_in_case_of_conflict.mdwn @@ -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 |