From cd8934e4a2268431d4cc5dc8e665cf5303dfdb46 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkaT0B6s9jQuMzQUYRVBgWqtO7BhT_ZSaE" Date: Sun, 22 Apr 2012 16:08:56 +0000 Subject: [PATCH 1/2] Added a comment --- .../comment_4_49a4fcd2dc4f97d4055b5051feea5e3b._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/error_in_installation_of_base-4.5.0.0/comment_4_49a4fcd2dc4f97d4055b5051feea5e3b._comment diff --git a/doc/forum/error_in_installation_of_base-4.5.0.0/comment_4_49a4fcd2dc4f97d4055b5051feea5e3b._comment b/doc/forum/error_in_installation_of_base-4.5.0.0/comment_4_49a4fcd2dc4f97d4055b5051feea5e3b._comment new file mode 100644 index 0000000000..ba99334511 --- /dev/null +++ b/doc/forum/error_in_installation_of_base-4.5.0.0/comment_4_49a4fcd2dc4f97d4055b5051feea5e3b._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkaT0B6s9jQuMzQUYRVBgWqtO7BhT_ZSaE" + nickname="Fernando Seabra" + subject="comment 4" + date="2012-04-22T16:08:55Z" + content=""" +Thanks, it worked now! +"""]] From 450201dcee2bd0900cf29da4ddf04a41457e3662 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ" Date: Mon, 23 Apr 2012 04:03:17 +0000 Subject: [PATCH 2/2] --- doc/forum/What_can_be_done_in_case_of_conflict.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/What_can_be_done_in_case_of_conflict.mdwn 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 0000000000..42167a6091 --- /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