mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Added a comment

Browse source
This commit is contained in:
http://joeyh.name/ 2014-04-17 20:00:22 +00:00 committed by admin
parent f86812f2d7
commit 503bac2243
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
doc/automatic_conflict_resolution/comment_7_3d2250cc26036b8532faa980065e20d0._comment Normal file
View file

@ -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.
"""]]