diff options
| author |  http://joeyh.name/ <http://joeyh.name/@web> | 2013-07-17 18:59:03 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2013-07-17 18:59:03 +0000 |
| commit | 28e8de40ffc2d63b25a353de3d1a1f01c8b2d58a (patch) | |
| tree | 24e17f85e41967818df21b94eeb925d44d26b063 /doc/forum | |
| parent | 1fd21f213c636f81bc6fe908b8f2766cf6cbe28f (diff) | |
Added a comment
Diffstat (limited to 'doc/forum')
| -rw-r--r-- | doc/forum/safely_dropping_git-annex_history/comment_7_42cf492fc98a9eba8176387749ef12e0._comment | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/forum/safely_dropping_git-annex_history/comment_7_42cf492fc98a9eba8176387749ef12e0._comment b/doc/forum/safely_dropping_git-annex_history/comment_7_42cf492fc98a9eba8176387749ef12e0._comment new file mode 100644 index 000000000..5c10b988c --- /dev/null +++ b/doc/forum/safely_dropping_git-annex_history/comment_7_42cf492fc98a9eba8176387749ef12e0._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.154.4.90" + subject="comment 7" + date="2013-07-17T18:59:03Z" + content=""" +I don't see any reason why squashing git-annex branch history would not work. If you squash it to the same sha in each clone, things would be very happy, but even if you squash it to different shas, the union merge should result in those different versions of the same data automatically merging together. +"""]] |