20:55:35kpoeckThe regression tests don't run with the parallel compiler
20:55:57kpoeckSo I take that nobody apart from me runs the regression-tests
20:56:19kpoeckI tried to fix that with https://github.com/clasp-developers/clasp/pull/918
20:56:41kpoeckBut this was not considered and now has a merge conflict
20:57:21kpoeckWhat is the recommended way to handle such a merge conflict?
20:59:10kpoeckrebase feature-varios-compile-file-fixes against current dev?
20:59:58Bikerebasing makes merge conflicts really annoying. you can just merge dev into your branch, fix the conflicts, and then push that, i think
21:00:03Bikeassuming the online interface doesn't work
21:00:44kpoeckok, try that (and my experience with rebase have been horrible, thats why i asked)
21:01:28Bikealso i didn't touch that PR because drmeister is the one in the middle of changing compile-file operations and i don't know what he's doing.