My apologies if this makes no sense. My Git Fu is weak (all my rebase are belong to somebody else).
I’m assuming that my fork of MODx 2.0 at GitHub does not automatically synchronize with the MODx repository it was forked from.
So . . . I want to have a local copy of the dev. 2.0 branch that is up-to-date.
Say I make some changes that I want to contribute. I add and commit them locally, push the changes to my fork, then issue a pull request.
Now, say that other changes that I want occur in the MODx 2.0 branch. To update, I’d pull those changes into my local branch and push them to my fork. If my pull request hasn’t been acted on yet (and it may never be, if it’s no good). I end up undoing my changes on both the local branch and the fork (no?). I’m not sure if the pull request is still good at that point (are pull requests tied to a particular branch, or to the HEAD?).
I don’t think rebase helps here if I’ve already committed the changes locally (which I have to do before pushing them to the fork to make the pull request).
I’m probably just confused here, but I’m hoping that somebody can straighten me out. I want to put detailed advice to potential contributors in the book and, if I understood this, I could make the docs clearer also.
Somebody must already be doing what I’m trying to set up (hopefully with some nice Git aliases).
On a side note, I’m on the slowest internet connection ever (in the wilds of the Oregon coast). My MiFi is hanging out the window and it still takes 3-10 minutes for every page request. In spite of that, Git Bash is still surprisingly fast and reliable.
I await enlightenment.
