Skip to content

Navigation Menu

Appearance settings

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

Appearance settings

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

symfony / symfony-docs Public

Notifications You must be signed in to change notification settings
Fork 5.2k
Star 2.3k

Code
Issues 85
Pull requests 92
Actions
Projects
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Security
Insights

Fix faulty conflict resolution#7527

Closed

dunglas wants to merge 1 commit intosymfony:mastersymfony/symfony-docs:masterfrom

dunglas:patch-11dunglas/symfony-docs:patch-11Copy head branch name to clipboard

Conversation Commits1 (1)Checks Files changed

Closed

Fix faulty conflict resolution#7527
dunglas wants to merge 1 commit intosymfony:masterfrom
dunglas:patch-11

Commits

Commits on Feb 24, 2017

Fix faulty conflict resolution
dunglas
authored

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.