*** Pumukel has quit IRC | 00:33 | |
*** fredvd has quit IRC | 00:53 | |
*** TresEquis has quit IRC | 01:53 | |
*** zenwryly has quit IRC | 01:53 | |
*** zenwryly has joined #zope | 01:55 | |
*** benji has quit IRC | 02:39 | |
*** srichter has quit IRC | 02:48 | |
*** alecm has quit IRC | 03:54 | |
*** mgedmin has quit IRC | 04:37 | |
*** sm has quit IRC | 04:37 | |
*** sm has joined #zope | 04:41 | |
*** mgedmin has joined #zope | 04:45 | |
*** agroszer has joined #zope | 08:59 | |
agroszer | ping mgedmin | 09:36 |
---|---|---|
mgedmin | pong | 09:37 |
agroszer | moin | 09:37 |
agroszer | mgedmin, have here a bunch of changes> | 09:37 |
agroszer | https://github.com/zopefoundation/z3c.form/compare/master...Shoobx:master | 09:37 |
agroszer | how could I merge that back to upstream in a sane way? | 09:37 |
mgedmin | uh, submit pull requests? many small pull requests :) | 09:37 |
agroszer | yeah thought the same | 09:38 |
agroszer | but how to split that up? | 09:38 |
mgedmin | maybe git cherry-pick can help? | 09:38 |
mgedmin | and/or git rebase | 09:38 |
mgedmin | or there's always a technique of opening two files side-by-side and extracting meaningful changes one by one | 09:39 |
mgedmin | works really well when the changes are non-intersecting | 09:39 |
agroszer | ok, I'll try my best | 09:39 |
mgedmin | all you need is a responsive upstream (ha ha good luck with z3c.form, luckily you've got the commit bit yourself ;) | 09:50 |
agroszer | I got also a few other powerful dudes on my side ;-) | 09:51 |
*** Pumukel has joined #zope | 09:51 | |
mgedmin | maybe one of them wants to fix https://github.com/zopefoundation/z3c.formdemo/issues/1 ;) | 09:53 |
agroszer | mmm travis is green? | 09:54 |
mgedmin | of z3c.formdemo? no | 09:54 |
mgedmin | (of z3c.form -- yes) | 09:54 |
agroszer | ohh my eyes | 09:54 |
agroszer | right | 09:55 |
agroszer | even more failures | 09:55 |
*** projekt01 has joined #zope | 10:00 | |
*** fredvd has joined #zope | 10:01 | |
*** srichter has joined #zope | 10:08 | |
*** giacomos has joined #zope | 10:25 | |
*** yvl has joined #zope | 10:38 | |
*** mup has quit IRC | 10:52 | |
*** mup_ has joined #zope | 10:52 | |
*** mup_ is now known as mup | 10:52 | |
*** fredvd has quit IRC | 10:53 | |
*** brutalnoodle has joined #zope | 11:32 | |
*** fredvd has joined #zope | 11:37 | |
*** fredvd has quit IRC | 11:41 | |
*** brutalnoodle has quit IRC | 12:24 | |
*** srichter has quit IRC | 12:37 | |
*** fredvd has joined #zope | 13:02 | |
*** projekt01 has quit IRC | 13:02 | |
*** srichter has joined #zope | 13:07 | |
*** fredvd has quit IRC | 13:19 | |
*** fredvd has joined #zope | 13:33 | |
*** benji has joined #zope | 14:02 | |
*** projekt01 has joined #zope | 14:06 | |
*** MatthewWilkes has quit IRC | 14:09 | |
*** MatthewWilkes has joined #zope | 14:11 | |
*** maurits has joined #zope | 14:22 | |
*** projekt01_ has joined #zope | 14:26 | |
*** projekt01__ has joined #zope | 14:30 | |
*** projekt01 has quit IRC | 14:30 | |
*** projekt01_ has quit IRC | 14:32 | |
*** Pumukel has quit IRC | 15:52 | |
*** brutalnoodle has joined #zope | 16:17 | |
*** tiwula has joined #zope | 16:28 | |
*** agroszer has quit IRC | 17:02 | |
*** fredvd is now known as fredvd|away | 17:37 | |
*** benji has quit IRC | 17:51 | |
*** benji has joined #zope | 17:52 | |
*** srichter has quit IRC | 18:32 | |
*** J1m has joined #zope | 18:39 | |
*** brutalnoodle has quit IRC | 18:48 | |
*** alecm has joined #zope | 19:13 | |
*** alecm has joined #zope | 19:13 | |
*** projekt01__ has left #zope | 19:25 | |
*** alecm has quit IRC | 20:08 | |
*** srichter has joined #zope | 20:14 | |
*** alecm has joined #zope | 20:33 | |
*** fredvd|away is now known as fredvd | 21:07 | |
*** giacomos has quit IRC | 21:33 | |
*** m8 has joined #zope | 22:18 | |
*** maurits has quit IRC | 22:20 | |
*** srichter has quit IRC | 23:00 | |
*** J1m has quit IRC | 23:03 | |
*** J1m has joined #zope | 23:04 | |
*** m8 has quit IRC | 23:53 |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!