Skip to content

prevent Unknown resource type error (issue #35) - #36

Open
ttoohey wants to merge 1 commit into
voxpupuli:masterfrom
ttoohey:bug/35
Open

prevent Unknown resource type error (issue #35)#36
ttoohey wants to merge 1 commit into
voxpupuli:masterfrom
ttoohey:bug/35

Conversation

@ttoohey

@ttoohey ttoohey commented Nov 20, 2017

Copy link
Copy Markdown

No description provided.

@bastelfreak bastelfreak added the bug Something isn't working label Nov 20, 2017
@bastelfreak

Copy link
Copy Markdown
Member

Hi @ttoohey, thanks for this patch. Are you able to provide a unit test to prove that this now compiles?

@alexjfisher

Copy link
Copy Markdown
Member

It looks like #10 was completely broken when merged. Looks like a rebase or merge from master went wrong and undid part of the changes.

@alexjfisher

Copy link
Copy Markdown
Member

I think the issue was #7 and #10 both were trying to fix the same issue.
#7 work starts
#10 work starts
#7 merged
#10 pull changes from master (including the #7 changes) and is then merged.

This PR undoes part of #10, but also leaves parts of it behind. Maybe we just revert #10 completely?
And apologies to all that PRs took so long before they were reviewed.

@alexjfisher alexjfisher left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'd prefer reverting #10 ?
@bastelfreak ?

@alexjfisher

Copy link
Copy Markdown
Member

@ttoohey Would you be able to try out #37 ? Thanks.

@ttoohey

ttoohey commented Nov 21, 2017

Copy link
Copy Markdown
Author

@bastelfreak - I'd like to have included a unit test, but I couldn't get past an error when trying to bundle install and I'm not very familiar with Ruby

@alexjfisher - yes, #37 solves my problem. I'm not sure it will solve what #10 was attempting (but this PR probably doesn't either).

@vox-pupuli-tasks

Copy link
Copy Markdown

Dear @ttoohey, thanks for the PR!

This is pccibot, your friendly Vox Pupuli GitHub Bot. I noticed that your pull request contains merge conflict. Can you please rebase?

You can find my sourcecode at voxpupuli/vox-pupuli-tasks

@vox-pupuli-tasks

Copy link
Copy Markdown

Dear @ttoohey, thanks for the PR!

This is pccibot, your friendly Vox Pupuli GitHub Bot. I noticed that your pull request contains merge conflict. Can you please rebase?

You can find my sourcecode at voxpupuli/vox-pupuli-tasks

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

Labels

bug Something isn't working merge-conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants