summaryrefslogtreecommitdiff
path: root/doc/bugs/Assistant_merge_loop
diff options
context:
space:
mode:
authorGravatar https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8 <Jon_Ander@web>2015-02-18 12:39:05 +0000
committerGravatar admin <admin@branchable.com>2015-02-18 12:39:05 +0000
commitc9359193887e6f70986bd877b3453edaf3ae1bb4 (patch)
tree34e5dfe23c509b767aafd0210c36e970355e5b11 /doc/bugs/Assistant_merge_loop
parent1f37e6aa68337888669d0b26980a3c191dfdd443 (diff)
Added a comment
Diffstat (limited to 'doc/bugs/Assistant_merge_loop')
-rw-r--r--doc/bugs/Assistant_merge_loop/comment_15_494f55419f131495a7994afe2a0e9bc3._comment54
1 files changed, 54 insertions, 0 deletions
diff --git a/doc/bugs/Assistant_merge_loop/comment_15_494f55419f131495a7994afe2a0e9bc3._comment b/doc/bugs/Assistant_merge_loop/comment_15_494f55419f131495a7994afe2a0e9bc3._comment
new file mode 100644
index 000000000..db92aadc6
--- /dev/null
+++ b/doc/bugs/Assistant_merge_loop/comment_15_494f55419f131495a7994afe2a0e9bc3._comment
@@ -0,0 +1,54 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8"
+ nickname="Jon Ander"
+ subject="comment 15"
+ date="2015-02-18T12:39:04Z"
+ content="""
+This is happening in in a repo shared by two computers using the webapp with version 5.20141125. All are empty commits.
+
+ * 23da33e - (7 minutes ago) merge refs/remotes/bitbucket/synced/master (HEAD, bitbucket/synced/master, annex/direct/master)
+ * 7bd23db - (67 minutes ago) merge refs/remotes/bitbucket/synced/master
+ * d2f5c6b - (2 hours ago) merge refs/remotes/bitbucket/synced/master
+ * 05c0448 - (12 hours ago) merge refs/remotes/bitbucket/synced/master
+ * 5c370aa - (19 hours ago) merge refs/remotes/bitbucket/synced/master
+ * c6d7be4 - (20 hours ago) merge refs/remotes/bitbucket/synced/master
+ * 507a6c7 - (21 hours ago) merge refs/remotes/bitbucket/synced/master
+ * 6932fec - (22 hours ago) merge refs/remotes/bitbucket/synced/master
+ * cc0efa1 - (23 hours ago) merge refs/remotes/bitbucket/synced/master
+ * 12a7b8f - (24 hours ago) merge refs/remotes/bitbucket/synced/master
+ * 49a3f2c - (25 hours ago) merge refs/remotes/bitbucket/synced/master
+ * 6611612 - (26 hours ago) merge refs/remotes/bitbucket/synced/master
+ * 303895c - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * 3f8c96b - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * f283e20 - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * 96b920e - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * 2c88b50 - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * 5f6643b - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * 7a2f5ff - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * 3bdb942 - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * d24de2b - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * b29d45e - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * 871adb7 - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ |\
+ * | 4138b01 - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ |/
+ * c754adc - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * 587a56a - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * 2d257fd - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * 23018bf - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * 9f202b7 - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * bdd40f4 - (2 days ago) merge refs/remotes/bitbucket/synced/master
+ * 146b1a5 - (4 days ago) merge refs/remotes/bitbucket/synced/master (bitbucket/master)
+ |\
+ * | 3886b4a - (4 days ago) merge refs/remotes/github/synced/master
+ * | 5714860 - (4 days ago) merge refs/remotes/github/synced/master
+ * | 64325a0 - (4 days ago) merge refs/remotes/github/synced/master
+ * | f1b49e6 - (5 days ago) merge refs/remotes/github/synced/master
+ * | 17330c8 - (5 days ago) merge refs/remotes/github/synced/master
+ |/
+ * 54f9a8b - (6 days ago) (synced/master, master)
+ * ceb8133 - (6 days ago)
+ * f36ae3b - (6 days ago)
+ * 6acdf4c - (6 days ago)
+
+"""]]