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 2013-10-07 13:12:05 -04:00
commit 86901393fc
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/tips/centralized_git_repository_tutorial/comment_2_528e92b21f0551fde4adb956654953ae._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.253.80"
subject="How can I resolve a non-fast-forware on the git-annex branch?"
date="2013-10-07T17:08:32Z"
content="""
By either running `git annex sync`, or if you want to pull and push yourself, by running `git annex merge` before pushing.
"""]]