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

Added a comment

Browse source
This commit is contained in:
Lukey 2021-06-24 17:43:36 +00:00 committed by admin
parent 879ac0b713
commit fb2e418fa2
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/todo/resolve_merge_conflicts_with_smallfiles/comment_2_4af09b9b24fc39bb702a5db05638a1c1._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="Lukey"
avatar="http://cdn.libravatar.org/avatar/c7c08e2efd29c692cc017c4a4ca3406b"
subject="comment 2"
date="2021-06-24T17:43:36Z"
content="""
The idea is to solve the conflicts in a similar way to conflicts in annexed files. I.e. by creating two files file.version-a and file.version-b.
"""]]