summaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution
Commit message (Expand)AuthorAge
* Added a comment: auto conflict resolutionGravatar https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc2014-04-19
* Added a commentGravatar http://joeyh.name/2014-04-17
* Added a comment: auto conflict resolution master branchGravatar https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc2014-04-13
* Added a commentGravatar http://joeyh.name/2014-03-26
* Added a comment: merge for master branch?Gravatar https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc2014-03-23
* removedGravatar https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc2014-03-23
* Added a comment: merge only for metadata branch?Gravatar https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc2014-03-23
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-20
|\
| * Added a commentGravatar http://joeyh.name/2014-03-20
* | fix up old comments that used format=txt, which is no longer enabledGravatar Joey Hess2014-03-20
|/
* Added a comment: Use automatic merge without syncingGravatar https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc2014-03-20
* Added a comment: Customise conflict resolution behaviourGravatar https://www.google.com/accounts/o8/id?id=AItOawnJTqmRu1YCKS2Hsm4vtOflLhP4fU-k98w2014-02-25