Due to some version control issues, i now have a perfectly good build, with all my scenes and scripts in order. However, when i want to work on my scene in the Editor, it’s weeks behind. Is there a way to say i want the scene in my build settings, to be the one in my folder, so i can keep on editting it?
This is not easy possible. When the game is built, the scenes are processed and changed and there is no unity-supported way of restoring a .unity file from distributed .asset files.
The (most probably) easiest way is to just bite the bullet and recreate the scene.
If your back is really against a wall and there is a shotgun pointing at you, then there might be a rather complicated way of getting some attributes extracted and re-imported. Basically, you can overwrite DLL’s in a built project, so what you could do is to write some script code that gets always executed when the scene loads, (e.g. by hooking into some Awake() of an object in the scene). Then iterate all own gameObjects/settings and write the information you want to some text file.
Finally, write some other editor tooling that reads in the text file and applies it to the scene in the editor.
If you are not firm in scripting and editor scripting, I strongly recommend you just recreate the scene from hand. 