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.