diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawnJTqmRu1YCKS2Hsm4vtOflLhP4fU-k98w <Ahmed@web> | 2014-02-25 11:42:08 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-02-25 11:42:08 +0000 |
| commit | 683353236dc28678b95093fcb976881bfb01a433 (patch) | |
| tree | b0f7154ccc55efb8d4184e6241faf17148741599 /doc/automatic_conflict_resolution | |
| parent | 6cc6cf01d1644df543d3e264d3f9ddb44e64424b (diff) | |
Added a comment: Customise conflict resolution behaviour
Diffstat (limited to 'doc/automatic_conflict_resolution')
| -rw-r--r-- | doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment b/doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment new file mode 100644 index 000000000..69e136b44 --- /dev/null +++ b/doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment @@ -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 ... + + +"""]] |