Skip to content

Conversation

treymd
Copy link

@treymd treymd commented Jan 23, 2016

No description provided.

Copy link
Author

Choose a reason for hiding this comment

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

Is this an artifact from deleted code?

Copy link

Choose a reason for hiding this comment

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

Witchery has / will have subschools.

If you're trying to merge the big desert thing, you should let me take a look at it and rebase it. I bet it's out of date after ~6 months gathering dust. Hit me up on IRC this weekend

@treymd
Copy link
Author

treymd commented Jan 23, 2016

this branch is just an experiment at this point, but perhaps we can use branches like this to get content ready for submission to the develop branch in a collaborative way. I already rebased this on develop,

@M59Gar
Copy link

M59Gar commented Jan 25, 2016

Yes, putting a branch out and having collaboration on it would be great. Also if this was simply merged so we could get on 104 and test it, I would be so happy. It's been on there before, and we found a bug or two related to immortals messing around in places, but I've got those written down and can fix them. This has been extensively tested by me and once by a group.

I genuinely just don't know how to continue working until this is all in.

@treymd
Copy link
Author

treymd commented Feb 21, 2016

We can't merge content until it is virtually bug free, and won't conflict with the work of others. However, we can work on branches like this until that goal is reached. This was what I was aiming to do. I believe we can have a branch in the project that many people can work on until it is ready to be merged to the develop branch.

@M59Gar M59Gar modified the milestone: Temp testing Feb 27, 2016
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