Skip to content
This repository has been archived by the owner on Feb 9, 2019. It is now read-only.

Predecessor does not *always* have an Heir #11

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

aventinesolutions
Copy link

I made some changes based on the requirements of a current project:

  1. That the acts_as_heir_of may be passed a symbol that needs to be converted to camel case (e.g. FeedbackNode), so I used the fork from 'davidkovaccs' which had already included a fix for this
  2. I did a small fix on signatures for David's change
  3. The acts_as_predecessor now does not always assume that there is an heir.

@dipth
Copy link
Owner

dipth commented Jul 22, 2013

@aventinesolutions could you please update this pull request?

@aventinesolutions
Copy link
Author

Confused ... I'm not sure what you mean by "update my pull request" ... merge from your master and (re)test then? Or something else? (Sorry, I don' t have that much experience with pull requests) ...

@dipth
Copy link
Owner

dipth commented Aug 19, 2013

@aventinesolutions there seems to be some merge conflicts preventing this pull request from getting merged.
So what you need to do is merge my latest master into your branch and resolve the conflicts

@aventinesolutions
Copy link
Author

Thomas,

Oké, will do.

2013/8/19 Thomas Dippel [email protected]

@aventinesolutions https://github.com/aventinesolutions there seems to
be some merge conflicts preventing this pull request from getting merged.
So what you need to do is merge my latest master into your branch and
resolve the conflicts


Reply to this email directly or view it on GitHubhttps://github.com//pull/11#issuecomment-22858034
.

Matthew Eichler
[email protected]
[email protected]

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

Successfully merging this pull request may close these issues.

2 participants