Symphony.

Here's a possibly stupid question.

I forked Symphony 2 and submitted patches for the 2.0.3 release. Now this release is out, my fork (of what was 2.0.2) is now out of date. How do I refresh it with the latest master or integration branch from the main Symphony repository?

I'm sure I remember some sort of "update" or "fast forward" button but this isn't shown to me on my fork.

A few ways I thought of, but none are intuitive:

• delete my fork and re-fork with the latest version
• download the Zip of 2.0.3, overwrite my local repo and commit back to my own for

Any pointers please? I'm getting the hang of using Github for my own extensions (when all I'm doing is making local changes and commiting to Github) but getting slightly lost with the forks of Symphony and multiple versions!

There's a guide about Keeping a git fork in sync with the forked repo on github :).

I knew there'd be a simple way of doing it. Ta!

For reference, these are the commands I used:

git remote add symphony git://github.com/symphony/symphony-2.git 
git pull symphony integration

This added the user "symphony" as a remote location for my local build, and allows me to pull its integration branch to my local build.

Don’t forget to

git push

afterward to synchronize your github repository.

Thanks mate.

The biggest problem I had was that my local Symphony 2.0.2 build into which I was making changes for 2.0.3 still had some changes that I never pushed to Github. When I updated my local 2.0.2 from the official 2.0.3 release (to bring it up to speed) there were a ton of merge conflicts that I couldn’t resolve on the command line.

I opted to delete the entire repo from Github and refork, which took about 10 seconds :-)

OK while we’re confessing our Git ignorance, could anyone give an overview description of their Git setup. As I understand it, you could have:

1. Symphony Master Repo
2. Your fork on Github
3. Another copy of your fork, but local (or on another remote env)

Then you screw around locally (or on another remote env with git) push it to your repo, then make a pull request to the master repo.

Also, how does this play into your live site management; do you run git on deployed site env to keep it updated?

I find myself creating a ‘master’ deployment-ready version that has everything I need (all extensions, etc). I know this is exactly what git is for, but I’m not familiar.