aboutsummaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment
blob: 57a8c45f84b2f1d073505acf203e47874ce7a3ca (plain)
1
2
3
4
5
6
7
8
9
10
[[!comment format=mdwn
 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 ...

 
"""]]