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 2014-03-20 11:10:13 -04:00
commit e78a03c536
5 changed files with 55 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/automatic_conflict_resolution/comment_2_0a8ea42764dde1a33d2112197b961c51._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc"
nickname="Matthias"
subject="Use automatic merge without syncing"
date="2014-03-20T10:03:41Z"
content="""
Is there a possibility to use the automatic merge logic without using \"git annex sync\"? I don't want to have the \"synced\"-branches, but the auto-conflict-resolution is very nice.
"""]]

8
doc/forum/Git_annex_on_Windows/comment_6_79fb5ec1b47593ab3355543c5499284a._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://alerque.com/"
nickname="Caleb"
subject="path issue"
date="2014-03-20T13:05:34Z"
content="""
It seems the use of the cmd folder in the Windows git-annex installer no longer meshes with the git install from msysgit. Changing \"cmd\" to \"bin\" during the install process made it work for me.
"""]]

21
doc/install/cabal/comment_33_8d4dfc33cada6091c30d3a43ce404b8b._comment Normal file
View file

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc"
nickname="Matthias"
subject="Build failure"
date="2014-03-20T09:10:44Z"
content="""
I followed the instructions and the invocation of
cabal install git-annex --bindir=$HOME/bin -f\"-assistant -webapp -webdav -pairing -xmpp -dns\"
resulted in the following error:
Test.hs:107:41: Not in scope: `errMessage'
Failed to install git-annex-5.20140306
cabal: Error: some packages failed to install:
git-annex-5.20140306 failed during the building phase. The exception was:
ExitFailure 1
I used the Haskell Platform for Mac OS X (10.8)
"""]]

8
doc/install/cabal/comment_34_38451e751add6daf479b559c4b6a7c61._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://openid.stackexchange.com/user/a05bb829-932b-49f2-85a9-00dcda8b5e20"
nickname="Christian Pietsch"
subject="Re: Build failure"
date="2014-03-20T13:56:16Z"
content="""
I get exactly the same error message as Matthias when attempting the minimal Cabal install on openSUSE 12.2 (x86_64) Linux.
"""]]

10
doc/todo/wishlist:_metadata_metadata_view/comment_4_d271fe711b3fe5ffeb52f1caf44622b3._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="Xyem"
ip="87.194.19.134"
subject="comment 4"
date="2014-03-20T08:14:20Z"
content="""
Awesome! :)
Thank you for adding this, I hope others find it as useful as I will.
"""]]