/irc-logs / w3c / #html-wg / 2013-03-18 / end

Options:

  1. # Session Start: Mon Mar 18 00:00:00 2013
  2. # Session Ident: #html-wg
  3. # [00:30] * Joins: karl (~karlcow@public.cloak)
  4. # [01:35] * Joins: cabanier (~cabanier@public.cloak)
  5. # [01:39] * Quits: cabanier (~cabanier@public.cloak) ("Leaving.")
  6. # [02:37] * Joins: cabanier (~cabanier@public.cloak)
  7. # [02:41] * Quits: cabanier (~cabanier@public.cloak) ("Leaving.")
  8. # [02:48] * Quits: karl (~karlcow@public.cloak) (Client closed connection)
  9. # [02:52] * Joins: cabanier (~cabanier@public.cloak)
  10. # [03:00] * Quits: cabanier (~cabanier@public.cloak) ("Leaving.")
  11. # [03:12] * Disconnected
  12. # [03:13] * Attempting to rejoin channel #html-wg
  13. # [03:13] * Rejoined channel #html-wg
  14. # [03:14] * Quits: arronei (~arronei@public.cloak) (Ping timeout: 60 seconds)
  15. # [03:14] * Quits: Dashiva (~noone@public.cloak) (Ping timeout: 60 seconds)
  16. # [03:14] * Dashimon is now known as Dashiva
  17. # [03:17] * Quits: Dashiva (~noone@public.cloak) (Client closed connection)
  18. # [03:17] * Quits: gavin_ (~gavin@public.cloak) (Client closed connection)
  19. # [03:17] * Quits: hober (~ted@public.cloak) (Client closed connection)
  20. # [03:17] * Quits: arronei_ (~arronei@public.cloak) (Client closed connection)
  21. # [03:17] * Joins: Dashiva (~noone@public.cloak)
  22. # [03:17] * Joins: gavin (~gavin@public.cloak)
  23. # [03:17] * Joins: arronei (~arronei@public.cloak)
  24. # [03:17] * Quits: logbot (~logbot@public.cloak) (Ping timeout: 60 seconds)
  25. # [03:17] * Joins: hober (~ted@public.cloak)
  26. # [03:17] * Quits: sawrubh (~uid6719@public.cloak) (Ping timeout: 60 seconds)
  27. # [03:17] * Quits: timeless (~uid4015@public.cloak) (Ping timeout: 60 seconds)
  28. # [03:18] * Joins: logbot (~logbot@public.cloak)
  29. # [03:26] * Joins: karl (~karlcow@public.cloak)
  30. # [03:29] * Quits: karl (~karlcow@public.cloak) (Client closed connection)
  31. # [03:29] * Quits: gavin (~gavin@public.cloak) (Client closed connection)
  32. # [03:29] * Joins: gavin (~gavin@public.cloak)
  33. # [03:29] * Quits: hober (~ted@public.cloak) (Client closed connection)
  34. # [03:30] * Joins: hober (~ted@public.cloak)
  35. # [03:36] * Joins: cabanier (~cabanier@public.cloak)
  36. # [03:41] * Joins: karl (~karlcow@public.cloak)
  37. # [05:17] * Joins: sawrubh (~uid6719@public.cloak)
  38. # [05:17] * Joins: timeless (~uid4015@public.cloak)
  39. # [05:28] * Quits: Dashiva (~noone@public.cloak) (Client closed connection)
  40. # [05:29] * Quits: karl (~karlcow@public.cloak) (Client closed connection)
  41. # [05:29] * Quits: gavin (~gavin@public.cloak) (Client closed connection)
  42. # [05:29] * Quits: silvia (~Adium@public.cloak) (Client closed connection)
  43. # [05:29] * Joins: silvia (~Adium@public.cloak)
  44. # [05:29] * Joins: Dashiva (~noone@public.cloak)
  45. # [05:30] * Joins: gavin (~gavin@public.cloak)
  46. # [05:30] * Quits: hober (~ted@public.cloak) (Client closed connection)
  47. # [05:30] * Joins: hober (~ted@public.cloak)
  48. # [05:30] * Quits: timeless (~uid4015@public.cloak) (Ping timeout: 60 seconds)
  49. # [05:31] * Quits: AnssiK (~uid10742@public.cloak) (Ping timeout: 60 seconds)
  50. # [05:31] * Joins: [Beta] (~beta@public.cloak)
  51. # [05:32] * Quits: johndrinkwater (~beta@public.cloak) (Ping timeout: 60 seconds)
  52. # [05:32] * Quits: gsnedders (~gsnedders@public.cloak) (Ping timeout: 60 seconds)
  53. # [05:33] * Joins: gsnedders (~gsnedders@public.cloak)
  54. # [07:31] * Joins: timeless (~uid4015@public.cloak)
  55. # [07:31] * Joins: AnssiK (~uid10742@public.cloak)
  56. # [07:59] * Joins: mjs (~mjs@public.cloak)
  57. # [08:08] * Joins: stommepoes (~stommepoes@public.cloak)
  58. # [08:15] * Joins: tobie (tobie@public.cloak)
  59. # [08:27] * Joins: jarek (~jarek@public.cloak)
  60. # [09:04] * Joins: gitbot (~gitbot@public.cloak)
  61. # [09:04] <gitbot> [html] silviapfeiffer pushed 11 new commits to master: https://github.com/w3c/html/compare/0dc65fd72ded...0dc7557ab7bd
  62. # [09:04] <gitbot> html/master bdae138 Silvia Pfeiffer: [agiowt] (1) Split more WebVTT-specific things into the WebVTT spec....
  63. # [09:04] <gitbot> html/master cc14e88 ianh: [e] (0) Reverse this set of cross-references to remove some ambiguity....
  64. # [09:04] <gitbot> html/master 5f8c5ac ianh: [e] (0) Clean up IDL...
  65. # [09:04] * Parts: gitbot (~gitbot@public.cloak) (gitbot)
  66. # [09:19] * Quits: mjs (~mjs@public.cloak) (mjs)
  67. # [09:30] * Quits: silvia (~Adium@public.cloak) ("Leaving.")
  68. # [10:40] * Joins: Steve (~chatzilla@public.cloak)
  69. # [10:41] * Joins: nonge (~nonge@public.cloak)
  70. # [10:44] * Quits: nonge_ (~nonge@public.cloak) (Ping timeout: 60 seconds)
  71. # [10:55] * Joins: darobin (rberjon@public.cloak)
  72. # [11:01] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
  73. # [11:01] * Joins: darobin (rberjon@public.cloak)
  74. # [11:11] * Quits: jarek (~jarek@public.cloak) (jarek)
  75. # [11:19] <Steve> darobin: need help with detached head...
  76. # [11:20] * Quits: Jedi (~Jedi@public.cloak) (Client closed connection)
  77. # [11:22] <darobin> Steve: I dunno, sew it back on trying to align major arteries?
  78. # [11:22] <Steve> :-)
  79. # [11:22] <Steve> yeah helpful
  80. # [11:23] <darobin> sorry, feels like my head's detached today
  81. # [11:23] <darobin> anyway, what's the problem?
  82. # [11:23] <Steve> I added a few fork markers commited then tried to syn got a detached head
  83. # [11:24] <darobin> whoa
  84. # [11:24] <Steve> opened the head fixed the conflicts, but don't know how to go from there
  85. # [11:24] <darobin> ah!
  86. # [11:24] <darobin> so you fixed all the conflicts?
  87. # [11:24] <darobin> normally you should just commit now
  88. # [11:25] <Steve> so whats the command for re-attaching the head
  89. # [11:26] <Steve> I usually use the github wndows gui which does stuff, but need to do stuff in command window
  90. # [11:26] <darobin> do you know if you are set to rebase rather than merge when pulling?
  91. # [11:26] * Joins: abarsto (~abarsto@public.cloak)
  92. # [11:26] * abarsto is now known as ArtB
  93. # [11:27] * Joins: Jedi (~Jedi@public.cloak)
  94. # [11:27] <Steve> no
  95. # [11:27] <darobin> if so, once you've committed your changes, try git rebase --continue
  96. # [11:27] <darobin> no you don't know? or no you're not?
  97. # [11:27] <darobin> if the former, give git rebase --contine a shot
  98. # [11:27] <Steve> In the coammand windoiw it says <bla bla | REBASE
  99. # [11:28] <darobin> what does git status tell you?
  100. # [11:29] <Steve> you must edit all conflicts then mark them as resolved using git add
  101. # [11:30] <Steve> the merge conflicts part I have done
  102. # [11:31] <darobin> have you git add'ed the files that you fixed?
  103. # [11:32] <darobin> if not, git add them, then run git rebase --continue
  104. # [11:44] <Steve> Ok so I have got to stiu where i am back at master and have one unsynced commit (one that caused issue) how do I roolback that commit?
  105. # [11:44] <Steve> situation
  106. # [11:47] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
  107. # [11:47] * Joins: darobin (rberjon@public.cloak)
  108. # [11:48] <darobin> is it a commit you made or one from the repo?
  109. # [11:48] * darobin is finding it difficult to do this without pointing at the command line over Steve's shoulder
  110. # [11:49] <Steve> its a commit i made but have not yet pushed to github
  111. # [11:49] <Steve> and yeah i feel your pain
  112. # [11:51] * Joins: karl (~karlcow@public.cloak)
  113. # [11:53] <darobin> you need to reset
  114. # [11:54] <darobin> git reset --hard the_commit_ref
  115. # [12:04] * Joins: silvia (~Adium@public.cloak)
  116. # [12:04] <Steve> ok so done that, now i need to pull form remote?
  117. # [12:04] <Steve> from
  118. # [12:11] <darobin> Steve: you can try pulling, but if you pulled before you should be fine?
  119. # [12:11] <darobin> in any case, pull should Just Work
  120. # [12:12] <Steve> darobin: yeah i have done it before but notes on command on my fucked machine, whats the command 'git pull ...
  121. # [12:13] <darobin> if you're in master, try git pull origin master
  122. # [12:14] <Steve> darobin: worked thanks sorry for the bother
  123. # [12:16] <darobin> Steve: no worries at all :)
  124. # [12:23] * Quits: silvia (~Adium@public.cloak) ("Leaving.")
  125. # [12:28] <stommepoes> ah joys of git
  126. # [12:45] * Joins: plh (plehegar@public.cloak)
  127. # [12:57] * Quits: NeatBasis (~quassel@public.cloak) (Client closed connection)
  128. # [12:58] <Steve> stommepoes:when git goes bad...
  129. # [13:05] * Quits: tobie (tobie@public.cloak)
  130. # [13:20] * Joins: tmpsantos (~tmpsantos@public.cloak)
  131. # [13:37] * Joins: tobie (tobie@public.cloak)
  132. # [13:48] * Joins: mjs (~mjs@public.cloak)
  133. # [13:48] * Quits: mjs (~mjs@public.cloak) (mjs)
  134. # [13:49] * Quits: tobie (tobie@public.cloak)
  135. # [14:10] * Joins: davidb (~davidb@public.cloak)
  136. # [14:18] * Quits: tmpsantos (~tmpsantos@public.cloak) ("Leaving")
  137. # [14:29] * Joins: Lachy (~Lachy@public.cloak)
  138. # [14:51] * Joins: jarek (~jarek@public.cloak)
  139. # [15:02] * Quits: jarek (~jarek@public.cloak) (jarek)
  140. # [15:02] * Joins: jarek (~jarek@public.cloak)
  141. # [15:39] * Quits: Steve (~chatzilla@public.cloak) (Client closed connection)
  142. # [16:23] * Joins: IanPouncey (~Adium@public.cloak)
  143. # [16:24] * Quits: IanPouncey (~Adium@public.cloak) (Client closed connection)
  144. # [16:24] * Joins: IanPouncey (~Adium@public.cloak)
  145. # [16:37] * Quits: Lachy (~Lachy@public.cloak) (Ping timeout: 60 seconds)
  146. # [16:37] * Joins: Lachy (~Lachy@public.cloak)
  147. # [16:41] * Quits: cabanier (~cabanier@public.cloak) ("Leaving.")
  148. # [16:43] * Joins: gitbot (~gitbot@public.cloak)
  149. # [16:43] <gitbot> [html] techtoons pushed 1 new commit to html5_canvas: https://github.com/w3c/html/commit/f68dafacffeeee50b4379f9043e956857ca4f5b8
  150. # [16:43] <gitbot> html/html5_canvas f68dafa Jay Munro: Changed "big pixels" to pixelated...
  151. # [16:43] * Parts: gitbot (~gitbot@public.cloak) (gitbot)
  152. # [16:50] * Joins: tobie (tobie@public.cloak)
  153. # [17:13] * Joins: cabanier (~cabanier@public.cloak)
  154. # [17:14] * Quits: jarek (~jarek@public.cloak) (jarek)
  155. # [17:19] * Joins: tmpsantos (~tmpsantos@public.cloak)
  156. # [17:19] * Quits: tmpsantos (~tmpsantos@public.cloak) (Client closed connection)
  157. # [17:43] * Joins: jarek (~jarek@public.cloak)
  158. # [18:04] * Quits: IanPouncey (~Adium@public.cloak) ("Leaving.")
  159. # [18:41] * Quits: jarek (~jarek@public.cloak) (jarek)
  160. # [18:47] * Quits: darobin (rberjon@public.cloak) (Client closed connection)
  161. # [19:05] * Joins: hlfh (~hlfh@public.cloak)
  162. # [19:14] * Quits: hlfh (~hlfh@public.cloak) (Client closed connection)
  163. # [20:10] * Joins: silvia (~Adium@public.cloak)
  164. # [20:13] * Parts: stommepoes (~stommepoes@public.cloak) (stommepoes)
  165. # [20:21] * Quits: silvia (~Adium@public.cloak) ("Leaving.")
  166. # [21:18] * Quits: ArtB (~abarsto@public.cloak) ("Leaving.")
  167. # [21:19] * Quits: davidb (~davidb@public.cloak) (davidb)
  168. # [22:03] * Joins: tinkster (~tai@public.cloak)
  169. # [23:12] * Quits: tobie (tobie@public.cloak) (Ping timeout: 60 seconds)
  170. # [23:26] * Joins: gitbot (~gitbot@public.cloak)
  171. # [23:26] <gitbot> [html] techtoons pushed 1 new commit to html5_canvas: https://github.com/w3c/html/commit/02b587dd054416de2f240fe86b780c95132f9463
  172. # [23:26] <gitbot> html/html5_canvas 02b587d Jay Munro: Added winding rule feature...
  173. # [23:26] * Parts: gitbot (~gitbot@public.cloak) (gitbot)
  174. # [23:30] * Quits: plh (plehegar@public.cloak) ("Leaving")
  175. # [23:55] * Quits: tinkster (~tai@public.cloak) (Ping timeout: 60 seconds)
  176. # Session Close: Tue Mar 19 00:00:00 2013

The end :)