diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-07 13:12:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-07 13:12:05 -0400 |
| commit | 730fa6910ad3feac0dc3f8d5c5f4f8a69a712565 (patch) | |
| tree | 15d8c85f432f151e19084f58add7a3e52a154c1b /doc | |
| parent | 894422e4234a463d34faf168b7b7cae68972a350 (diff) | |
| parent | d0af8bf58bf0018bb57bd27f21349a4740f8992a (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tips/centralized_git_repository_tutorial/comment_2_528e92b21f0551fde4adb956654953ae._comment | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/tips/centralized_git_repository_tutorial/comment_2_528e92b21f0551fde4adb956654953ae._comment b/doc/tips/centralized_git_repository_tutorial/comment_2_528e92b21f0551fde4adb956654953ae._comment new file mode 100644 index 000000000..21b286fff --- /dev/null +++ b/doc/tips/centralized_git_repository_tutorial/comment_2_528e92b21f0551fde4adb956654953ae._comment @@ -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. +"""]] |