forked from https://github.com/symfony/symfony

This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.

Go to file

Fabien Potencier a47a5aa52c merged branch umpirsky/issue-3379 (PR #3922 ) Commits ------- `24bd8f4` Added missing dot to translation messages. `4bff221` Added missing dot to translation messages. `7454894` Added missing dot to translation messages. `6e90c50` Updated upgrade instructions. `7e21dd1` Added missing dot to translation messages. Discussion ---------- Issue 3379 This should fix [issues 3379](https://github.com/symfony/symfony/issues/3379) --------------------------------------------------------------------------- by stof at 2012-04-13T15:06:32Z Your branch conflicts with master. Please rebase it --------------------------------------------------------------------------- by umpirsky at 2012-04-13T19:11:54Z @stof I tried to rebase, I'm not sure if I did everything right. Is it ok now? --------------------------------------------------------------------------- by umpirsky at 2012-04-13T19:12:06Z @stof I tried to rebase, I'm not sure if I did everything right. Is it ok now? --------------------------------------------------------------------------- by mvrhov at 2012-04-13T19:19:34Z IMHO no, because there are commits from other people. Did you follow the [instructions](http://symfony.com/doc/current/contributing/code/patches.html#id1)? --------------------------------------------------------------------------- by stof at 2012-04-13T19:36:53Z @mvrhov commits from others ? --------------------------------------------------------------------------- by umpirsky at 2012-04-13T19:41:53Z @stof There were some, so I reverted. Now I'm trying again following instructions from Symfony doc. I come to this: ``` $ git push origin issue-3379 To git@github.com:umpirsky/symfony.git ! [rejected] issue-3379 -> issue-3379 (non-fast-forward) error: failed to push some refs to 'git@github.com:umpirsky/symfony.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. ``` And I don't know how to fix this. Any idea? --------------------------------------------------------------------------- by stof at 2012-04-13T19:43:45Z @umpirsky when you rebase, it is logical to need to force the push --------------------------------------------------------------------------- by umpirsky at 2012-04-13T19:44:38Z @stof I did `git push -f origin issue-3379`. I hope it's fixed now. --------------------------------------------------------------------------- by maoueh at 2012-04-13T20:39:34Z @umpirsky seems better than last time I checked :) --------------------------------------------------------------------------- by umpirsky at 2012-04-13T20:43:04Z @maoueh Is it good enough? :) --------------------------------------------------------------------------- by maoueh at 2012-04-13T20:51:27Z @umpirsky At least, the rebase seems good enough :D As for the subject of the PR, I don't pronounce myself ;) --------------------------------------------------------------------------- by vicb at 2012-04-13T20:53:23Z you should probably squash the commits		2012-04-18 11:57:20 +02:00
src/Symfony	merged branch umpirsky/issue-3379 (PR #3922 )	2012-04-18 11:57:20 +02:00
.gitignore	added composer.lock to .gitignore	2012-04-06 22:15:14 -03:00
.travis.yml	tweaked previous merge	2012-04-18 11:17:58 +02:00
CHANGELOG-2.0.md	updated CHANGELOG for 2.0.12	2012-03-19 00:56:33 +01:00
CHANGELOG-2.1.md	[Validator] Fixed typo, updated CHANGELOG and UPGRADE	2012-04-17 17:19:12 +02:00
CONTRIBUTORS.md	update CONTRIBUTORS for 2.0.12	2012-03-19 00:57:27 +01:00
LICENSE	Updated LICENSE files copyright	2012-02-22 10:10:37 +01:00
README.md	set travis-ci icon to master	2011-11-23 11:36:09 +01:00
UPGRADE-2.1.md	merged branch umpirsky/issue-3379 (PR #3922 )	2012-04-18 11:57:20 +02:00
autoload.php.dist	tweaked previous merge	2012-04-18 11:17:58 +02:00
check_cs	moved component and bridge unit tests to the src/ directory	2012-03-29 08:37:22 +02:00
composer.json	tweaked previous merge	2012-04-18 11:17:58 +02:00
phpunit.xml.dist	tweaked previous merge	2012-04-18 11:17:58 +02:00

README.md

README

What is Symfony2?

Symfony2 is a PHP 5.3 full-stack web framework. It is written with speed and flexibility in mind. It allows developers to build better and easy to maintain websites with PHP.

Symfony can be used to develop all kind of websites, from your personal blog to high traffic ones like Dailymotion or Yahoo! Answers.

Requirements

Symfony2 is only supported on PHP 5.3.2 and up.

Installation

The best way to install Symfony2 is to download the Symfony Standard Edition available at http://symfony.com/download.

Documentation

The "Quick Tour" tutorial gives you a first feeling of the framework. If, like us, you think that Symfony2 can help speed up your development and take the quality of your work to the next level, read the official Symfony2 documentation.

Contributing

Symfony2 is an open source, community-driven project. If you'd like to contribute, please read the Contributing Code part of the documentation. If you're submitting a pull request, please follow the guidelines in the Submitting a Patch section.