Maybe this is not the most elegant way of doing it (let me know if there is a better way), but it works, so here we go:
Our whole project lives in a git repo on our server. We have defined some ignores in .gitignore (such as vendor/) To work on the project we clone it from the server (git clone ...) To merge the most up-to-date version of symfony-standard i add the symfony-standard master branch as remote to the repo: > git remote add symfony https://github.com/symfony/symfony-standard.git then i fetch the contents of symfony-standard > git fetch symfony then i checkout the according version of symfony-standard, lets say BETA3 > git checkout v2.0.0BETA3 then i create a new branch for that version > git checkout -b beta3 then i switch back to master > git checkout master then i merge the beta3 branch into master > git merge beta3 then i get some conflicts (but not many:) i fix them in netbeans by right-clicking on my project and selecting "git/resolve conflicts" then i update the vendors > ./bin/vendors.php then i do propper testing. this is the point where incompatibilities between bundle versions show up. i try to find the right versions of bundles (which work together) and update my bin/2.0.0BETA3.deps file. After tests run through, i commit the merged version. Finally i push it to the server. Commands are not tested, hope i didn't forget anything... BR Stephan On May 28, 12:18 pm, spider <spide...@gmail.com> wrote: > Hello, > > with 1.4x I used for my project SVN versioning with "externals" for Symfony > and other library I needed. When a new 1.4x version was out I was able to > update it just changing the reference and doing a svn update. > > Now with 2.0 I moved to git to conform with the framework, but I cannot find > a nice way to keep update between a release to another. Can someone point me > to a how to or a guide on this topic or have some suggestions? > > Thank you in advance. > Lorenzo Lazzeri -- If you want to report a vulnerability issue on symfony, please send it to security at symfony-project.com You received this message because you are subscribed to the Google Groups "symfony users" group. To post to this group, send email to symfony-users@googlegroups.com To unsubscribe from this group, send email to symfony-users+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/symfony-users?hl=en
