So subversion (the one and only I was avoiding) seems to have the solution
, but my question is how would that work if people have to push changes from a remote place (another pc) and I don't have a Fix/Stable/Own public IP but a dynamic one? I wouldn't like to make branches on a production server and work with them there, there should be only the Live/Production branch. I hope you understand my question.
I do have another idea but I will have to test it first and then I will let you know, it involves a Shorcut/Copy/Remote folder called Production (like a shared folder over the network) of the live website and that will be a masterbranch and when merged changes to that folder they auto update because it's a "shared" folder copy of the webXX/web/.