19913d85-f662-4518-a9a1-7adc1793dfd4.png){kind=small}
Channels
#announcements
- s
schrockn
08/29/2018, 9:13 PMworst - f
freiksenet
08/29/2018, 9:13 PMthree way diffs help tho - s
schrockn
08/29/2018, 9:13 PMwhat tool do you use for that - f
freiksenet
08/29/2018, 9:13 PM[merge] conflictstyle = diff3 - f
freiksenet
08/29/2018, 9:13 PMgit - f
freiksenet
08/29/2018, 9:13 PMah, atomt- 2
- 1
- s
schrockn
08/29/2018, 9:13 PMcool that sounds great - f
freiksenet
08/29/2018, 9:13 PMgit does 3 way diffs, atom makes them nice to mreg, it has built in diff too - f
freiksenet
08/29/2018, 9:14 PMthis helps - f
freiksenet
08/29/2018, 9:14 PMbut it's not ideal still - s
schrockn
08/30/2018, 5:03 AM@freiksenet morning? - s
schrockn
08/30/2018, 5:03 AMyou around - s
schrockn
08/30/2018, 5:03 AMif not nbd i’ll pop you an emial - s
schrockn
08/30/2018, 5:23 AMemail it is - s
schrockn
08/30/2018, 5:23 AMbedtime for me - s
schrockn
08/30/2018, 5:23 AMhave a good day! - f
freiksenet
08/30/2018, 6:07 AMsorry Just work up - f
freiksenet
08/30/2018, 7:02 AMwoke - s
schrockn
08/30/2018, 11:41 AMhello sir - f
freiksenet
08/30/2018, 11:41 AMgood morning - s
schrockn
08/30/2018, 11:41 AMhow goes it - f
freiksenet
08/30/2018, 11:41 AMfinished execution results - f
freiksenet
08/30/2018, 11:41 AMalso python2.7 support is 1line change, I've added it - f
freiksenet
08/30/2018, 11:41 AMI mean, failing test support - s
schrockn
08/30/2018, 11:41 AMright - f
freiksenet
08/30/2018, 11:41 AMeverything fails with syntax errors after it - s
schrockn
08/30/2018, 11:42 AMya of course - s
schrockn
08/30/2018, 11:42 AMwhat other environments should we support/test - f
freiksenet
08/30/2018, 11:43 AM3.6, 2.7? - s
schrockn
08/30/2018, 11:43 AMpython 3.7 too