[squidsk]

Originally Posted by ub.ch

Heya!

thank you so much for the article!

I still have a question

As far as I understood the changes made in my local repository (so eg /var/www/) are never pushed?
I am still confused as to how this exactly works, but shouldn't changed that have been commited also be pushed?
Especially if you were to have a dev environment and a live environment.

My plan is to "work" on the dev env, to rebases etc, and once done push all those commits to live.
Or - if absolutely need be - do changes on live and push them back to the repo to also have them on dev

As far as I can see this does not work?
Seeing that the changes made in /var/www are never pushed?
Or am I missing something?

Again thank you so much for posting!

To do what you want you'd need a third level repository for your live site that is downstream from the second repository in the article.

Something like:

[pre] vb repo
|
dev repo
|
live repo
[/pre]
The dev repo is the second repo from the article. You use it to deal with upstream changes from vbulletin as well as your own customizations. Once you have all of that dealt with you can fetch the changes in the live repo and reset to HEAD, which will update/add/delete all relevant files.