Symphony.

@jonasd Jonas, ‘good’ to know that I’m not the only one struggling :-) Your approach is what I was initially thinking of, but Charles’ solution seems a bit better, so I’ll try that first.

Great to hear you are writing a guide on ‘Git and Symphony’: Git seems to become the standard (convention). Any ideas on when we can expect the first guide(s)? Will you publish this on your site or on the Symphony Docs?

Charles: thanks, that seems a good solution, I’ll try it out.

Who is Charles?

C’mon! everybody know that Craig prefers to be called Charles…

(facepalm)

Thanks Tim, for pointing out my mistake… ;-)

You are welcome, Dennis!

@davidhund the Git guide will be in the official Symphony documentation. It’s in draft form now; I hope to have it released in the next week or two. (Depending on how long it takes us to get it revised and loaded into the site.)

Wonderful news Jonas. Man I am starting to love this Symphony community…

not sure if this is the right place to put this, but for some reason, when i try to do a git install on my server, i cannot do this step from the README file:

git submodule update --init

I have always been unsuccessful to get that particular call to work. instead, i have been doing this:

git submodule init
git submodule update

and that works completely fine

I think that’s a Git version thing maybe…

Charles

When I have local changes and I have to make a pull, I like to do:

git stash
git pull origin master
git stash apply

It’ll first stash your local changes, make the pull then apply the changes back to the updated repo. Usually if the remote updates differ to the local changes, everything will apply cleanly. If there are conflicts, the process is the same as a merge.