Skip to content

Conversation

@xabbuh
Copy link
Member

@xabbuh xabbuh commented Dec 7, 2014

Q A
Doc fix? yes
New docs? no
Applies to all
Fixed tickets

The button was mistakenly removed in c090a74.

@xabbuh
Copy link
Member Author

xabbuh commented Dec 9, 2014

@weaverryan @wouterj Can we merge this? Otherwise, all pull requests based on the 2.3 branch will continue to fail.

@wouterj
Copy link
Member

wouterj commented Dec 11, 2014

Thanks Christian! I'm sorry for the delay. When working on a PR, I can't merge PRs until I commit changes...

@wouterj wouterj merged commit eabcc59 into symfony:2.3 Dec 11, 2014
wouterj added a commit that referenced this pull request Dec 11, 2014
This PR was merged into the 2.3 branch.

Discussion
----------

[Best Practices] readd mistakenly removed label

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets |

The button was mistakenly removed in c090a74.

Commits
-------

eabcc59 readd mistakenly removed label
@xabbuh xabbuh deleted the fix-build-error branch December 11, 2014 12:51
@stof
Copy link
Member

stof commented Dec 11, 2014

@wouterj git stash is your friend (or git commit -m 'WIP' and the git commit --amend when working on the change again to finish it)

@wouterj
Copy link
Member

wouterj commented Dec 11, 2014

@stof yeah, just learned stash from @xabbuh. It looks pretty great :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants