@user Granted, I haven't actually added anything since starting the JS branch, but I think it shouldn't be a problem if you have your code split among multiple files. Most of the time, I'm not going to be changing Main.scala, so the changes should apply cleanly across branches. It's probably going to result in a lot of merge commits, but oh well.