Howdy,
Lemme introduce my situation.
I've been running Apache/MySQL/PHP on my own PC for about a year now, and have finally gotten "real" space for my webpage on Work the web. I've been basically running my site off my own machine, and have finally chosen to make it go live. It was pretty easy getting the database stuff copied up to my domain, but there were a few issues I ran into while I was getting it all up and running. These were mostly minor differences between my home setup and the setup on my website domain (absolute paths, and a few things in the directory structure that I wanted to keep different on my machine vs. on the web). For these issues I just began using two separate include files.
With everything set up on my machine and on the web, I simply make changes to them on my machine until I'm satisfied, then upload files and database changes. This gives me a level of confidence that things will not be broken when I merge the changes.
I was curious to see how other people go about merging their changes. Does anyone do anything similar or different? Anyone use a repository? What other ideas are out there?
Talk to you later