Skip to content

Added limitations in 'Managing Common Dependencies with Parent Services'... #2501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

venu
Copy link
Contributor

@venu venu commented Apr 13, 2013

This PR adds a caution in 'Managing Common Dependencies with Parent Services' page.

Q A
Doc fix? yes (Improvement on existing docs)
New docs? no
Applies to all
Fixed tickets -

Ref: Source code, Issue

@venu
Copy link
Contributor Author

venu commented Apr 13, 2013

Also, I have took ths commit (Fixing a bad merge conflict) and applied in my commit.

@stof
Copy link
Member

stof commented Apr 13, 2013

you should not have taken this change in your own commit (your commit now duplicates the changeset in the history). You should have based yoru work on top of the existing branch.

@venu
Copy link
Contributor Author

venu commented Apr 13, 2013

@stof, yeah thats true. I should not have taken this change but I would have had to work on bad merge conflict without fixing it.
Problem is that commit was not merged to 2.0 branch.

shall I make another pull request with keeping bad conflicts in code?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants