|
07:50
lizmat left
11:06
patrickb left
11:37
librasteve_ left
11:49
lizmat joined
11:56
lizmat left
12:19
patrickb joined
12:27
lizmat joined
12:28
lizmat left
12:29
lizmat_ joined,
lizmat_ left
12:45
rba left
13:00
rba joined
13:15
lizmat joined
13:16
lizmat left,
lizmat_ joined
13:19
lizmat_ left
13:32
librasteve_ joined
15:02
finanalyst joined
15:53
finanalyst left
16:18
timo2 is now known as timo
19:56
arkiuat joined
|
|||
| arkiuat | [Coke], the conflict is between (orig) Language/modules.rakudoc lines 52-536 and (wayland's rewrite) Languages/distributions/uploading.rakudoc lines 692-1176 | 20:01 | |
| I've cloned wayland's repo, so I can isolate those out and diff them directly to see just how much is in conflict | |||
| the only other conflict is in .gitignore and I suspect wayland didn't even intend those changes to carry over, so we can just drop those | 20:02 | ||
| the line count of the two sections is both 484, so probably only minor changes | 20:03 | ||
| well, those line numbers aren't quite correct (they're comparing main and modules-rewrite from wayland's repo) but I still think I can isolate the diff | 20:09 | ||
| yeah, I'm confused now. This is trickier to do by hand on someone else's work than I thought | 20:14 | ||
| wayland's Language/distributions/uploading.rakudoc only has 81 lines in it, so I got it confused with something from the actual merge-conflict file I'm looking at in my local clone repo | 20:18 | ||
| I'm throwing in the towel, but I can condense what I've written here into a comment on the PR if you think that might be helpful for whoever looks at it next. I'm sure it would be easier with write access | 20:20 | ||
| (and now I'm not asking for write access yet: I did this because I thought I might learn a bit more about branches and merging. Still too much of a novice) | 20:21 | ||
| s/now/no/ | 20:22 | ||
|
20:58
arkiuat left
21:10
arkiuat joined
21:15
arkiuat left
21:16
arkiuat joined
22:25
Voldenet left
22:27
Voldenet joined
22:36
arkiuat left
22:40
lizmat joined,
lizmat left
|
|||
| [Coke] | I will absolutely give you write access if that helps. :) | 22:42 | |
| You've done a bunch in the past few weeks. (same for ds) | 22:43 | ||
|
22:49
arkiuat joined
22:53
arkiuat left
23:14
arkiuat joined
23:41
lizmat joined
23:44
lizmat left
|
|||