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

Added a comment: Customise conflict resolution behaviour

Browse source
This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawnJTqmRu1YCKS2Hsm4vtOflLhP4fU-k98w 2014-02-25 11:42:08 +00:00 • committed by admin
commit cb91f3c86a
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=txt
username="https://www.google.com/accounts/o8/id?id=AItOawnJTqmRu1YCKS2Hsm4vtOflLhP4fU-k98w"
nickname="Ahmed"
subject="Customise conflict resolution behaviour"
date="2014-02-25T11:42:08Z"
content="""
How to customise git-annex conflict resolution behaviour, such that for example: change naming convention of conflicted files with suffix or prefix, move conflicted files to another directory structure, overwrite conflicted files from preferred content ...
"""]]