mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2012-04-23 10:04:58 -04:00
commit 8ae37ddacc
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
doc/forum/What_can_be_done_in_case_of_conflict.mdwn Normal file
View 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

8
doc/forum/error_in_installation_of_base-4.5.0.0/comment_4_49a4fcd2dc4f97d4055b5051feea5e3b._comment Normal file
View file

@ -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!
"""]]