diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-04-23 10:04:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-04-23 10:04:58 -0400 |
| commit | 8ae37ddacc1d6a024ed5f482135ea08693416d83 (patch) | |
| tree | 30d81451388314ba24dcd4c7df09508581515ba2 | |
| parent | 1db09af14cf41dff96be23935e4a690b95c0f6b8 (diff) | |
| parent | 450201dcee2bd0900cf29da4ddf04a41457e3662 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/forum/What_can_be_done_in_case_of_conflict.mdwn | 7 | ||||
| -rw-r--r-- | doc/forum/error_in_installation_of_base-4.5.0.0/comment_4_49a4fcd2dc4f97d4055b5051feea5e3b._comment | 8 |
2 files changed, 15 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 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 000000000..ba9933451 --- /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! +"""]] |