diff options
| author |  http://joeyh.name/ <http://joeyh.name/@web> | 2013-10-07 17:08:34 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2013-10-07 17:08:34 +0000 |
| commit | d0af8bf58bf0018bb57bd27f21349a4740f8992a (patch) | |
| tree | 75f0ca364fc18e5bb0f8b90688a0b43b8eec68a2 /doc/tips/centralized_git_repository_tutorial | |
| parent | 4a969659cdb14a8816379c067ce2ba0e7c119608 (diff) | |
Added a comment: How can I resolve a non-fast-forware on the git-annex branch?
Diffstat (limited to 'doc/tips/centralized_git_repository_tutorial')
| -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. +"""]] |