diff options
| author |  http://joeyh.name/ <http://joeyh.name/@web> | 2014-04-17 20:00:22 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-04-17 20:00:22 +0000 |
| commit | 4bceb531db147cb670369b01faddeb8b5b025123 (patch) | |
| tree | fca13462a18602b34e3972dd6b1fe122d5eda436 /doc/automatic_conflict_resolution/comment_7_3d2250cc26036b8532faa980065e20d0._comment | |
| parent | 1afbe9a28f668c179c0cf61c13abb6532cd0c061 (diff) | |
Added a comment
Diffstat (limited to 'doc/automatic_conflict_resolution/comment_7_3d2250cc26036b8532faa980065e20d0._comment')
| -rw-r--r-- | doc/automatic_conflict_resolution/comment_7_3d2250cc26036b8532faa980065e20d0._comment | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/doc/automatic_conflict_resolution/comment_7_3d2250cc26036b8532faa980065e20d0._comment b/doc/automatic_conflict_resolution/comment_7_3d2250cc26036b8532faa980065e20d0._comment new file mode 100644 index 000000000..9f49021da --- /dev/null +++ b/doc/automatic_conflict_resolution/comment_7_3d2250cc26036b8532faa980065e20d0._comment @@ -0,0 +1,23 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.191" + subject="comment 7" + date="2014-04-17T20:00:22Z" + content=""" +@Matthias, here is an example of git-annex merge updating the master branch from the synced/master branch that was pushed to it earlier: + +<pre> +joey@darkstar:~/tmp/test/2>git annex merge +merge git-annex (merging synced/git-annex into git-annex...) +ok +merge synced/master +Updating 7942eee..1f3422e +Fast-forward + new_file | 1 + + 1 file changed, 1 insertion(+) + create mode 120000 new_file +ok +</pre> + +If you are having trouble with it somehow, I'd suggest filing a bug report. +"""]] |