git-annex/doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment

[[!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 ...

 
"""]]
fix up old comments that used format=txt, which is no longer enabled 2014-03-20 16:09:09 +00:00			`[[!comment format=mdwn`
Added a comment: Customise conflict resolution behaviour 2014-02-25 11:42:08 +00:00			`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 ...`


			`"""]]`