Je travaille actuellement sur un projet basé sur le framework symfony. J'utilise l'outil de synchronisation GIT et je rencontre des problèmes avec ce dernier.
J'ai mis à jour les bundles de mon projet via GIT et je me suis rendu compte que depuis la mise à jour des bundles certain fichiers n'étaient pas pris en compte.
J'ai regarder au niveau de git ce qui en était avec la commande git status et j'obtiens cela:
Code : Tout sélectionner
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: app/Resources/views/base.html.twig
# modified: app/config/routing.yml
# modified: composer.lock
# deleted: src/Srs/EventBundle/Resources/views/Event/menu.html.twig
# new file: vendor/Trsteel/ckeditor-bundle/Trsteel/CkeditorBundle
# modified: vendor/autoload.php
# modified: vendor/composer/autoload_real.php
# modified: vendor/composer/installed.json
# new file: vendor/kriswallsmith/assetic
# new file: vendor/twig/extensions
# new file: web/bundles/acmedemo/css/demo.css
# new file: web/bundles/acmedemo/images/blue-arrow.png
# new file: web/bundles/acmedemo/images/field-background.gif
# new file: web/bundles/acmedemo/images/logo.gif
# new file: web/bundles/acmedemo/images/search.png
# new file: web/bundles/acmedemo/images/welcome-configure.gif
# new file: web/bundles/acmedemo/images/welcome-demo.gif
# new file: web/bundles/acmedemo/images/welcome-quick-tour.gif
# new file: web/bundles/framework/css/exception.css
# new file: web/bundles/framework/css/exception_layout.css
# new file: web/bundles/framework/images/blue_picto_less.gif
# new file: web/bundles/framework/images/blue_picto_more.gif
# new file: web/bundles/framework/images/border_l.png
# new file: web/bundles/framework/images/border_r.png
# new file: web/bundles/framework/images/btn_bg.png
# new file: web/bundles/framework/images/close_quote.gif
# new file: web/bundles/framework/images/exception_detected.gif
# new file: web/bundles/framework/images/exception_detected.png
# new file: web/bundles/framework/images/grey_magnifier.png
# new file: web/bundles/framework/images/icon_log.png
# new file: web/bundles/framework/images/input_bg.gif
# new file: web/bundles/framework/images/logo_symfony.gif
# new file: web/bundles/framework/images/logo_symfony.png
# new file: web/bundles/framework/images/open_quote.gif
# new file: web/bundles/sensiodistribution/webconfigurator/css/configure.css
# new file: web/bundles/sensiodistribution/webconfigurator/css/install.css
# new file: web/bundles/sensiodistribution/webconfigurator/images/background-textfield.gif
# new file: web/bundles/sensiodistribution/webconfigurator/images/blue-arrow.png
# new file: web/bundles/sensiodistribution/webconfigurator/images/favicon.ico
# new file: web/bundles/sensiodistribution/webconfigurator/images/logo-big.gif
# new file: web/bundles/sensiodistribution/webconfigurator/images/logo-small.gif
# new file: web/bundles/sensiodistribution/webconfigurator/images/notification.gif
# new file: web/bundles/webprofiler/css/profiler.css
# new file: web/bundles/webprofiler/favicon.ico
# new file: web/bundles/webprofiler/images/close.png
# new file: web/bundles/webprofiler/images/config.png
# new file: web/bundles/webprofiler/images/db.png
# new file: web/bundles/webprofiler/images/events.png
# new file: web/bundles/webprofiler/images/exception.png
# new file: web/bundles/webprofiler/images/import.png
# new file: web/bundles/webprofiler/images/logger.png
# new file: web/bundles/webprofiler/images/mail.png
# new file: web/bundles/webprofiler/images/memory.png
# new file: web/bundles/webprofiler/images/profiler/bg_submenu.gif
# new file: web/bundles/webprofiler/images/profiler/bg_submenu.png
# new file: web/bundles/webprofiler/images/profiler/border_l.png
# new file: web/bundles/webprofiler/images/profiler/border_r.png
# new file: web/bundles/webprofiler/images/profiler/btn_bg.png
# new file: web/bundles/webprofiler/images/profiler/config.png
# new file: web/bundles/webprofiler/images/profiler/db.png
# new file: web/bundles/webprofiler/images/profiler/events.png
# new file: web/bundles/webprofiler/images/profiler/exception.png
# new file: web/bundles/webprofiler/images/profiler/grey_magnifier.png
# new file: web/bundles/webprofiler/images/profiler/input_bg.gif
# new file: web/bundles/webprofiler/images/profiler/logger.png
# new file: web/bundles/webprofiler/images/profiler/logo_symfony_profiler.gif
# new file: web/bundles/webprofiler/images/profiler/logo_symfony_profiler.png
# new file: web/bundles/webprofiler/images/profiler/mail.png
# new file: web/bundles/webprofiler/images/profiler/request.png
# new file: web/bundles/webprofiler/images/profiler/routing.png
# new file: web/bundles/webprofiler/images/profiler/security.png
# new file: web/bundles/webprofiler/images/profiler/spinner.gif
# new file: web/bundles/webprofiler/images/profiler/time.png
# new file: web/bundles/webprofiler/images/request.png
# new file: web/bundles/webprofiler/images/routing.png
# new file: web/bundles/webprofiler/images/search.png
# new file: web/bundles/webprofiler/images/security.png
# new file: web/bundles/webprofiler/images/spacer.gif
# new file: web/bundles/webprofiler/images/symfony.png
# new file: web/bundles/webprofiler/images/time.png
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# (commit or discard the untracked or modified content in submodules)
#
# modified: src/Srs/EventBundle/Controller/EventController.php
# modified: vendor/Trsteel/ckeditor-bundle/Trsteel/CkeditorBundle (modified content, untracked content)
# modified: vendor/kriswallsmith/assetic (modified content)
# modified: vendor/twig/extensions (modified content)
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .travis.yml
# nbproject/private/
# src/Srs/CommentBundle/Entity/Comment.php~
# src/Srs/NewsBundle/Entity/News.php~
# src/Srs/TagBundle/Entity/Tag.php~
# vendor/doctrine/common/.gitmodules
# vendor/doctrine/common/.travis.yml
# vendor/doctrine/dbal/.gitmodules
# vendor/doctrine/dbal/.travis.yml
# vendor/doctrine/doctrine-bundle/Doctrine/Bundle/DoctrineBundle/.travis.yml
# vendor/doctrine/orm/.gitmodules
# vendor/doctrine/orm/.travis.yml
# vendor/friendsofsymfony/user-bundle/FOS/UserBundle/.travis.yml
# vendor/jms/di-extra-bundle/JMS/DiExtraBundle/.travis.yml
# vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Tests/DependencyInjection/Compiler/Fixtures/
# vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Tests/Fixture/EmptyDirectory/
# vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/.travis.yml
# vendor/monolog/monolog/tests/Monolog/Handler/Fixtures/
# vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/.travis.yml
# vendor/sensio/generator-bundle/Sensio/Bundle/GeneratorBundle/.travis.yml
# vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/test/site/protected/.htpasswd
# vendor/swiftmailer/swiftmailer/test-suite/lib/simpletest/test/site/temp/
# vendor/symfony/monolog-bundle/Symfony/Bundle/MonologBundle/.travis.yml
# vendor/symfony/swiftmailer-bundle/Symfony/Bundle/SwiftmailerBundle/.travis.yml
# vendor/symfony/symfony/.editorconfig
# vendor/symfony/symfony/.travis.yml
# vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/.gitattributes
# vendor/symfony/symfony/src/Symfony/Bridge/Monolog/.gitattributes
# vendor/symfony/symfony/src/Symfony/Bridge/Propel1/.gitattributes
# vendor/symfony/symfony/src/Symfony/Bridge/Swiftmailer/.gitattributes
# vendor/symfony/symfony/src/Symfony/Bridge/Twig/.gitattributes
# vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/.gitattributes
# vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/.gitattributes
# vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/.gitattributes
# vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/BrowserKit/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/ClassLoader/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Config/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Console/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/CssSelector/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/DomCrawler/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Filesystem/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Finder/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Form/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/HttpKernel/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Locale/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Process/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Routing/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Security/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Serializer/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Templating/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Translation/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Validator/.gitattributes
# vendor/symfony/symfony/src/Symfony/Component/Yaml/.gitattributes
# vendor/twig/twig/.editorconfig
# vendor/twig/twig/.travis.ymlJe suis très embêter car les membres du projet n'obtiennent pas les sources correctement et voient une panoplie d'erreur germer.You have both vendor/Trsteel/ckeditor-bundle/Trsteel/CkeditorBundle and vendor/Trsteel/ckeditor-bundle/Trsteel/CkeditorBundle/.gitignore
error: Error building trees
En espérant qu'un pro du git puisse me venir en aide.
Bonne journée