diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc <Matthias@web> | 2014-04-13 17:48:20 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-04-13 17:48:20 +0000 |
| commit | 6ce6a61d72bb485c2024aac4f63a6a5e4be6a500 (patch) | |
| tree | 93e256a3c99c2164e8badee16018db572d3664f5 /doc/automatic_conflict_resolution | |
| parent | 6b36e3e5691e321f6ab0ebdc53d7044b4aba03e5 (diff) | |
Added a comment: auto conflict resolution master branch
Diffstat (limited to 'doc/automatic_conflict_resolution')
| -rw-r--r-- | doc/automatic_conflict_resolution/comment_6_8a0860fee88f5954918305f055a39d8d._comment | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/automatic_conflict_resolution/comment_6_8a0860fee88f5954918305f055a39d8d._comment b/doc/automatic_conflict_resolution/comment_6_8a0860fee88f5954918305f055a39d8d._comment new file mode 100644 index 000000000..4e9493d12 --- /dev/null +++ b/doc/automatic_conflict_resolution/comment_6_8a0860fee88f5954918305f055a39d8d._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc" + nickname="Matthias" + subject="auto conflict resolution master branch" + date="2014-04-13T17:48:19Z" + content=""" +@joeyh: This must be a misunderstanding of what I want. I use version 5.20140320. I can't find a workflow where \"git annex merge\" changes my master branch, it only updates the git-annex branch. + +Thinking again of it after some time, I am basically fine with \"git annex sync\". The only thing I am uncomfortable with is that the automatic merge is pushed without review. +"""]] |